openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stev...@apache.org
Subject svn commit: r1441343 [28/35] - in /openoffice/branches/ia2: ./ ext_libraries/apr-util/ ext_libraries/apr/ ext_sources/ extras/l10n/source/ast/ extras/l10n/source/da/ extras/l10n/source/eu/ extras/l10n/source/gd/ extras/l10n/source/ko/ extras/l10n/sourc...
Date Fri, 01 Feb 2013 08:46:35 GMT
Modified: openoffice/branches/ia2/main/svx/source/svdraw/svdoole2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/svdraw/svdoole2.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/svdraw/svdoole2.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/svdraw/svdoole2.cxx Fri Feb  1 08:46:00 2013
@@ -782,8 +782,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::Embed
         SetResizeProtect(sal_True);
 
     // #108759# For math objects, set closed state to transparent
-    if( ImplIsMathObj( xObjRef.GetObject() ) )
-        SetClosedObj( false );
+    SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() ));
 }
 
 // -----------------------------------------------------------------------------
@@ -805,8 +804,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::Embed
         SetResizeProtect(sal_True);
 
     // #108759# For math objects, set closed state to transparent
-    if( ImplIsMathObj( xObjRef.GetObject() ) )
-        SetClosedObj( false );
+    SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() ));
 }
 
 // -----------------------------------------------------------------------------
@@ -829,8 +827,7 @@ SdrOle2Obj::SdrOle2Obj( const svt::Embed
         SetResizeProtect(sal_True);
 
     // #108759# For math objects, set closed state to transparent
-    if( ImplIsMathObj( xObjRef.GetObject() ) )
-        SetClosedObj( false );
+    SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() ));
 }
 
 // -----------------------------------------------------------------------------
@@ -1584,8 +1581,7 @@ void SdrOle2Obj::SetObjRef( const com::s
             SetResizeProtect(sal_True);
 
         // #108759# For math objects, set closed state to transparent
-        if( ImplIsMathObj( rNewObjRef ) )
-            SetClosedObj( false );
+        SetClosedObj(!ImplIsMathObj( rNewObjRef ));
 
         Connect();
     }
@@ -2117,8 +2113,7 @@ void SdrOle2Obj::GetObjRef_Impl()
 			}
 
             // #108759# For math objects, set closed state to transparent
-            if( ImplIsMathObj( xObjRef.GetObject() ) )
-                SetClosedObj( false );
+            SetClosedObj(!ImplIsMathObj( xObjRef.GetObject() ));
 		}
 
         if ( xObjRef.is() )

Modified: openoffice/branches/ia2/main/svx/source/svdraw/svdstr.src
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/svdraw/svdstr.src?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/svdraw/svdstr.src (original)
+++ openoffice/branches/ia2/main/svx/source/svdraw/svdstr.src Fri Feb  1 08:46:00 2013
@@ -2763,12 +2763,12 @@ Bitmap SIP_SA_PAGESHADOW35X35
 
 Bitmap SIP_SA_MARKERS
 {
-	File = "markers.bmp";
+	File = "markers.png";
 };
 
 Bitmap SIP_SA_FINE_MARKERS
 {
-	File = "markers2.bmp";
+	File = "markers2.png";
 };
 
 // #100499#
@@ -2780,7 +2780,7 @@ Bitmap BMP_SVXOLEOBJ
 // #101928#
 Bitmap SIP_SA_ACCESSIBILITY_MARKERS
 {
-	File = "markersACC.bmp";
+	File = "markersACC.png";
 };
 
 String STR_ObjNameSingulMEDIA

Modified: openoffice/branches/ia2/main/svx/source/svdraw/svdxcgv.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/svdraw/svdxcgv.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/svdraw/svdxcgv.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/svdraw/svdxcgv.cxx Fri Feb  1 08:46:00 2013
@@ -54,6 +54,12 @@
 #include <svl/style.hxx>
 #include <fmobj.hxx>
 #include <vcl/svgdata.hxx>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
+#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
+#include <drawinglayer/geometry/viewinformation2d.hxx>
+#include <svx/sdr/contact/viewcontact.hxx>
+#include <svx/sdr/contact/objectcontactofobjlistpainter.hxx>
+#include <svx/sdr/contact/displayinfo.hxx>
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -553,14 +559,42 @@ BitmapEx SdrExchangeView::GetMarkedObjBi
 
 		if( !aBmp )
 		{
-            const GDIMetaFile aGDIMetaFile(GetMarkedObjMetaFile(bNoVDevIfOneBmpMarked));
-    		const Rectangle aBound(GetMarkedObjBoundRect());
-           
-            aBmp = convertMetafileToBitmapEx(
-                aGDIMetaFile,
-                basegfx::B2DRange(
-                    aBound.Left(), aBound.Top(),
-                    aBound.Right(), aBound.Bottom()));
+            // choose conversion directly using primitives to bitmap to avoid
+            // rendering errors with tiled bitmap fills (these will be tiled in a
+            // in-between metafile, but tend to show 'gaps' since the target is *no*
+            // bitmap rendering)
+            ::std::vector< SdrObject* > aSdrObjects(GetMarkedObjects());
+            const sal_uInt32 nCount(aSdrObjects.size());
+
+            if(nCount)
+            {
+                // collect sub-primitives as group objects, thus no expensive append
+                // to existing sequence is needed
+                drawinglayer::primitive2d::Primitive2DSequence xPrimitives(nCount);
+
+                for(sal_uInt32 a(0); a < nCount; a++)
+                {
+                    xPrimitives[a] = new drawinglayer::primitive2d::GroupPrimitive2D(
+                        aSdrObjects[a]->GetViewContact().getViewIndependentPrimitive2DSequence());
+                }
+
+                // get logic range
+                const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
+                const basegfx::B2DRange aRange(
+                    drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(
+                        xPrimitives, 
+                        aViewInformation2D));
+
+                if(!aRange.isEmpty())
+                {
+                    // if we have geometry and it has a range, convert to BitmapEx using
+                    // common tooling
+                    aBmp = convertPrimitive2DSequenceToBitmapEx(
+                        xPrimitives,
+                        aRange,
+                        500000);
+                }
+            }
 		}
 	}
 
@@ -716,9 +750,10 @@ Graphic SdrExchangeView::GetObjGraphic( 
 
 // -----------------------------------------------------------------------------
 
-void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const
+::std::vector< SdrObject* > SdrExchangeView::GetMarkedObjects() const
 {
 	SortMarkedObjects();
+    ::std::vector< SdrObject* > aRetval;
 
     ::std::vector< ::std::vector< SdrMark* > >  aObjVectors( 2 );
     ::std::vector< SdrMark* >&                  rObjVector1 = aObjVectors[ 0 ];
@@ -745,9 +780,27 @@ void SdrExchangeView::DrawMarkedObj(Outp
         for( sal_uInt32 i = 0; i < rObjVector.size(); i++ )
         {
     		SdrMark*    pMark = rObjVector[ i ];
-            pMark->GetMarkedSdrObj()->SingleObjectPainter( rOut ); // #110094#-17
+            aRetval.push_back(pMark->GetMarkedSdrObj());
         }
     }
+
+    return aRetval;
+}
+
+// -----------------------------------------------------------------------------
+
+void SdrExchangeView::DrawMarkedObj(OutputDevice& rOut) const
+{
+    ::std::vector< SdrObject* > aSdrObjects(GetMarkedObjects());
+
+    if(aSdrObjects.size())
+    {
+        sdr::contact::ObjectContactOfObjListPainter aPainter(rOut, aSdrObjects, aSdrObjects[0]->GetPage());
+        sdr::contact::DisplayInfo aDisplayInfo;
+
+        // do processing
+        aPainter.ProcessDisplay(aDisplayInfo);
+    }
 }
 
 // -----------------------------------------------------------------------------
@@ -763,66 +816,45 @@ SdrModel* SdrExchangeView::GetMarkedObjM
 
 	if( !mxSelectionController.is() || !mxSelectionController->GetMarkedObjModel( pNeuPag ) )
 	{
-		::std::vector< ::std::vector< SdrMark* > >  aObjVectors( 2 );
-		::std::vector< SdrMark* >&                  rObjVector1 = aObjVectors[ 0 ];
-		::std::vector< SdrMark* >&                  rObjVector2 = aObjVectors[ 1 ];
-		const SdrLayerAdmin&                        rLayerAdmin = pMod->GetLayerAdmin();
-		const sal_uInt32                            nControlLayerId = rLayerAdmin.GetLayerID( rLayerAdmin.GetControlLayerName(), sal_False );
-		sal_uInt32                                  n, nCount, nCloneErrCnt = 0;
-
-		for( n = 0, nCount = GetMarkedObjectCount(); n < nCount; n++ )
-		{
-			SdrMark* pMark = GetSdrMarkByIndex( n );
-
-			// paint objects on control layer on top of all otherobjects
-			if( nControlLayerId == pMark->GetMarkedSdrObj()->GetLayer() )
-				rObjVector2.push_back( pMark );
-			else
-				rObjVector1.push_back( pMark );
-		}
+        ::std::vector< SdrObject* > aSdrObjects(GetMarkedObjects());
 
 		// #i13033#
 		// New mechanism to re-create the connections of cloned connectors
 		CloneList aCloneList;
+        sal_uInt32 nCloneErrCnt(0);
 
-		for( n = 0, nCount = aObjVectors.size(); n < nCount; n++ )
+		for( sal_uInt32 i(0); i < aSdrObjects.size(); i++ )
 		{
-			::std::vector< SdrMark* >& rObjVector = aObjVectors[ n ];
+			const SdrObject*    pObj = aSdrObjects[i];
+			SdrObject*          pNeuObj;
 
-			for( sal_uInt32 i = 0; i < rObjVector.size(); i++ )
+			if( pObj->ISA( SdrPageObj ) )
 			{
-   				const SdrMark*      pMark = rObjVector[ i ];
-				const SdrObject*    pObj = pMark->GetMarkedSdrObj();
-				SdrObject*          pNeuObj;
-
-				if( pObj->ISA( SdrPageObj ) )
-				{
-					// convert SdrPageObj's to a graphic representation, because
-					// virtual connection to referenced page gets lost in new model
-					pNeuObj = new SdrGrafObj( GetObjGraphic( pMod, pObj ), pObj->GetLogicRect() );
-					pNeuObj->SetPage( pNeuPag );
-					pNeuObj->SetModel( pNeuMod );
-				}
-				else
-				{
-					// #116235#
-    				// pNeuObj = pObj->Clone( pNeuPag, pNeuMod );
-    				pNeuObj = pObj->Clone();
-					pNeuObj->SetPage( pNeuPag );
-					pNeuObj->SetModel( pNeuMod );
-				}
+				// convert SdrPageObj's to a graphic representation, because
+				// virtual connection to referenced page gets lost in new model
+				pNeuObj = new SdrGrafObj( GetObjGraphic( pMod, pObj ), pObj->GetLogicRect() );
+				pNeuObj->SetPage( pNeuPag );
+				pNeuObj->SetModel( pNeuMod );
+			}
+			else
+			{
+				// #116235#
+    			// pNeuObj = pObj->Clone( pNeuPag, pNeuMod );
+    			pNeuObj = pObj->Clone();
+				pNeuObj->SetPage( pNeuPag );
+				pNeuObj->SetModel( pNeuMod );
+			}
 
-				if( pNeuObj )
-				{
-					SdrInsertReason aReason(SDRREASON_VIEWCALL);
-					pNeuPag->InsertObject(pNeuObj,CONTAINER_APPEND,&aReason);
+			if( pNeuObj )
+			{
+				SdrInsertReason aReason(SDRREASON_VIEWCALL);
+				pNeuPag->InsertObject(pNeuObj,CONTAINER_APPEND,&aReason);
 
-					// #i13033#
-					aCloneList.AddPair(pObj, pNeuObj);
-				}
-				else
-					nCloneErrCnt++;
+				// #i13033#
+				aCloneList.AddPair(pObj, pNeuObj);
 			}
+			else
+				nCloneErrCnt++;
 		}
 
 		// #i13033#

Modified: openoffice/branches/ia2/main/svx/source/tbxctrls/extrusioncontrols.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/tbxctrls/extrusioncontrols.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/tbxctrls/extrusioncontrols.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/tbxctrls/extrusioncontrols.cxx Fri Feb  1 08:46:00 2013
@@ -28,11 +28,6 @@
 
 #include <string> // HACK: prevent conflict between STLPORT and Workshop headers
 
-#include <com/sun/star/util/XURLTransformer.hpp> 
-#include <com/sun/star/awt/MenuItemStyle.hpp>
-#include <com/sun/star/awt/XPopupMenuExtended.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
-
 #include <vos/mutex.hxx>
 
 #include <svtools/toolbarmenu.hxx>

Modified: openoffice/branches/ia2/main/svx/source/tbxctrls/fontworkgallery.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/tbxctrls/fontworkgallery.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/tbxctrls/fontworkgallery.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/tbxctrls/fontworkgallery.cxx Fri Feb  1 08:46:00 2013
@@ -100,21 +100,18 @@ FontWorkGalleryDialog::FontWorkGalleryDi
 	maCtlFavorites.SetLineCount( nLineCount );
 	maCtlFavorites.SetExtraSpacing( 3 );
 
-	initfavorites( GALLERY_THEME_FONTWORK, maFavoritesHorizontal );
-	fillFavorites( GALLERY_THEME_FONTWORK, maFavoritesHorizontal );
+	initFavorites( GALLERY_THEME_FONTWORK );
+	fillFavorites( GALLERY_THEME_FONTWORK );
 }
 
-static void delete_bitmap( Bitmap* p ) { delete p; }
-
 // -----------------------------------------------------------------------
 FontWorkGalleryDialog::~FontWorkGalleryDialog()
 {
-	std::for_each( maFavoritesHorizontal.begin(), maFavoritesHorizontal.end(), delete_bitmap );
 }
 
 // -----------------------------------------------------------------------
 
-void FontWorkGalleryDialog::initfavorites(sal_uInt16 nThemeId, std::vector< Bitmap * >& rFavorites)
+void FontWorkGalleryDialog::initFavorites(sal_uInt16 nThemeId)
 {
 	// Ueber die Gallery werden die Favoriten eingelesen
 	sal_uIntPtr nFavCount = GalleryExplorer::GetSdrObjCount( nThemeId );
@@ -126,35 +123,32 @@ void FontWorkGalleryDialog::initfavorite
 	FmFormModel *pModel = NULL;
 	for( nModelPos = 0; nModelPos < nFavCount; nModelPos++ )
 	{
-		Bitmap* pThumb = new Bitmap;
-
-		if( GalleryExplorer::GetSdrObj( nThemeId, nModelPos, pModel, pThumb ) )
-		{
-/*
-			VirtualDevice aVDev;
-			Size aRenderSize( aThumbSize.Width() * 4, aThumbSize.Height() * 4 );
-			aVDev.SetOutputSizePixel( aRenderSize );
+		BitmapEx aThumb;
 
-			if( GalleryExplorer::DrawCentered( &aVDev, *pModel ) )
-			{
-				aThumb = aVDev.GetBitmap( Point(), aVDev.GetOutputSizePixel() );
+        GalleryExplorer::GetSdrObj(nThemeId, nModelPos, pModel, &aThumb);
 
-				Size aMS( 4, 4 );
-				BmpFilterParam aParam( aMS );
-				aThumb.Filter( BMP_FILTER_MOSAIC, &aParam );
-				aThumb.Scale( aThumbSize );
-			}
-*/
-		}
+        if(!!aThumb)
+        {
+            static const sal_uInt32 nLen(8);
+            static const Color aW(COL_WHITE);
+            static const Color aG(0xef, 0xef, 0xef);
+            VirtualDevice aVDev;
+            const Point aNull(0, 0);
+            const Size aSize(aThumb.GetSizePixel());
+
+            aVDev.SetOutputSizePixel(aSize);
+            aVDev.DrawCheckered(aNull, aSize, nLen, aW, aG);
+            aVDev.DrawBitmapEx(aNull, aThumb);
 
-		rFavorites.push_back( pThumb );
+            maFavoritesHorizontal.push_back(aVDev.GetBitmap(aNull, aSize));
+        }
 	}
 
 	// Gallery thema freigeben
 	GalleryExplorer::EndLocking(nThemeId);
 }
 
-void FontWorkGalleryDialog::fillFavorites( sal_uInt16 nThemeId, std::vector< Bitmap * >& rFavorites )
+void FontWorkGalleryDialog::fillFavorites(sal_uInt16 nThemeId)
 {
 	mnThemeId = nThemeId;
 
@@ -164,7 +158,7 @@ void FontWorkGalleryDialog::fillFavorite
 	aThumbSize.Width() -= 12;
 	aThumbSize.Height() -= 12;
 
-	std::vector< Bitmap * >::size_type nFavCount = rFavorites.size();
+	std::vector< Bitmap * >::size_type nFavCount = maFavoritesHorizontal.size();
 
 	// ValueSet Favoriten
 	if( nFavCount > (nColCount * nLineCount) )
@@ -182,7 +176,7 @@ void FontWorkGalleryDialog::fillFavorite
 		String aStr(SVX_RES(RID_SVXFLOAT3D_FAVORITE));
 		aStr += sal_Unicode(' ');
 		aStr += String::CreateFromInt32((sal_Int32)nFavorite);
-		Image aThumbImage( *rFavorites[nFavorite-1] );
+		Image aThumbImage( maFavoritesHorizontal[nFavorite-1] );
 		maCtlFavorites.InsertItem( (sal_uInt16)nFavorite, aThumbImage, aStr );
 	}
 }

Modified: openoffice/branches/ia2/main/svx/source/xoutdev/_xoutbmp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/xoutdev/_xoutbmp.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/xoutdev/_xoutbmp.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/xoutdev/_xoutbmp.cxx Fri Feb  1 08:46:00 2013
@@ -19,8 +19,6 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
@@ -37,6 +35,7 @@
 #include "svx/xoutbmp.hxx"
 #include <svtools/FilterConfigItem.hxx>
 #include <svtools/filter.hxx>
+#include <vcl/dibtools.hxx>
 
 // -----------
 // - Defines -
@@ -53,186 +52,6 @@
 
 GraphicFilter* XOutBitmap::pGrfFilter = NULL;
 
-// -----------------------------------------------------------------------------
-
-BitmapEx XOutBitmap::CreateQuickDrawBitmapEx( const Graphic& rGraphic, const OutputDevice& rCompDev,
-											  const MapMode& rMapMode, const Size& rLogSize,
-											  const Point& rPoint, const Size& rSize )
-{
-	BitmapEx aRetBmp;
-
-	if( rGraphic.IsAlpha() )
-		aRetBmp = rGraphic.GetBitmapEx();
-	else
-	{
-		VirtualDevice	aVDev( rCompDev );
-		MapMode			aMap( rMapMode );
-
-		aMap.SetOrigin( Point() );
-		aVDev.SetMapMode( aMap );
-
-		Point	aPoint( aVDev.LogicToPixel( rPoint ) );
-		Size	aOldSize( aVDev.LogicToPixel( rSize ) );
-		Size	aAbsSize( aOldSize );
-		Size	aQSizePix( aVDev.LogicToPixel( rLogSize ) );
-
-		aVDev.SetMapMode( MapMode() );
-
-		if( aOldSize.Width() < 0 )
-			aAbsSize.Width() = -aAbsSize.Width();
-
-		if( aOldSize.Height() < 0 )
-			aAbsSize.Height() = -aAbsSize.Height();
-
-		if( aVDev.SetOutputSizePixel( aAbsSize ) )
-		{
-			Point		aNewOrg( -aPoint.X(), -aPoint.Y() );
-			const Point	aNullPoint;
-
-			// horizontale Spiegelung ggf. beruecksichtigen
-			if( aOldSize.Width() < 0 )
-			{
-				aNewOrg.X() -= aOldSize.Width();
-
-				// und jetzt noch einen abziehen
-				aNewOrg.X()--;
-			}
-
-			// vertikale Spiegelung ggf. beruecksichtigen
-			if( rSize.Height() < 0 )
-			{
-				aNewOrg.Y() -= aOldSize.Height();
-
-				// und jetzt noch einen abziehen
-				aNewOrg.Y()--;
-			}
-
-			if( rGraphic.GetType() != GRAPHIC_BITMAP )
-			{
-				rGraphic.Draw( &aVDev, aNewOrg, aQSizePix );
-
-				const Bitmap	aBmp( aVDev.GetBitmap( aNullPoint, aAbsSize ) );
-				Bitmap			aMask;
-
-				Graphic( rGraphic.GetGDIMetaFile().GetMonochromeMtf( COL_BLACK ) ).Draw( &aVDev, aNewOrg, aQSizePix );
-				aMask = aVDev.GetBitmap( aNullPoint, aAbsSize );
-				aRetBmp = BitmapEx( aBmp, aMask );
-			}
-			else
-			{
-				Bitmap	aBmp( rGraphic.GetBitmap() );
-
-// UNX has got problems with 1x1 bitmaps which are transparent (KA 02.11.1998)
-#ifdef UNX
-				const Size	aBmpSize( aBmp.GetSizePixel() );
-				sal_Bool		bFullTrans = sal_False;
-
-				if( aBmpSize.Width() == 1 && aBmpSize.Height() == 1 && rGraphic.IsTransparent() )
-				{
-					Bitmap				aTrans( rGraphic.GetBitmapEx().GetMask() );
-					BitmapReadAccess*	pMAcc = aBmp.AcquireReadAccess();
-
-					if( pMAcc )
-					{
-						if( pMAcc->GetColor( 0, 0 ) == BitmapColor( Color( COL_WHITE ) ) )
-							bFullTrans = sal_True;
-
-						aTrans.ReleaseAccess( pMAcc );
-					}
-				}
-
-				if( !bFullTrans )
-#endif // UNX
-
-				{
-					DitherBitmap( aBmp );
-					aVDev.DrawBitmap( aNewOrg, aQSizePix, aBmp );
-					aBmp = aVDev.GetBitmap( aNullPoint, aAbsSize );
-
-					if( !rGraphic.IsTransparent() )
-						aRetBmp = BitmapEx( aBmp );
-					else
-					{
-						Bitmap	aTrans( rGraphic.GetBitmapEx().GetMask() );
-
-						if( !aTrans )
-							aRetBmp = BitmapEx( aBmp, rGraphic.GetBitmapEx().GetTransparentColor() );
-						else
-						{
-							aVDev.DrawBitmap( aNewOrg, aQSizePix, aTrans );
-							aRetBmp = BitmapEx( aBmp, aVDev.GetBitmap( Point(), aAbsSize ) );
-						}
-					}
-				}
-			}
-		}
-	}
-
-	return aRetBmp;
-}
-
-// ------------------------------------------------------------------------
-
-void XOutBitmap::DrawQuickDrawBitmapEx( OutputDevice* pOutDev, const Point& rPt,
-										const Size& rSize, const BitmapEx& rBmpEx )
-{
-	const Size		aBmpSizePix( rBmpEx.GetSizePixel() );
-	const Size		aSizePix( pOutDev->LogicToPixel( rSize ) );
-
-	if ( ( aSizePix.Width() - aBmpSizePix.Width() ) || ( aSizePix.Height() - aBmpSizePix.Height() ) )
-		rBmpEx.Draw( pOutDev, rPt, rSize );
-	else
-		rBmpEx.Draw( pOutDev, rPt );
-}
-
-// ------------------------------------------------------------------------
-
-void XOutBitmap::DrawTiledBitmapEx( OutputDevice* pOutDev,
-									const Point& rStartPt, const Size& rGrfSize,
-									const Rectangle& rTileRect, const BitmapEx& rBmpEx )
-{
-	Rectangle		aClipRect( pOutDev->LogicToPixel( pOutDev->GetClipRegion().GetBoundRect() ) );
-	Rectangle		aPixRect( pOutDev->LogicToPixel( rTileRect ) );
-	const Size		aPixSize( pOutDev->LogicToPixel( rGrfSize ) );
-	const Point		aPixPoint( pOutDev->LogicToPixel( rStartPt ) );
-	Point  			aOrg;
-	const long		nWidth = aPixSize.Width();
-	const long 		nHeight = aPixSize.Height();
-	long			nXPos = aPixPoint.X() + ( ( aPixRect.Left() - aPixPoint.X() ) / nWidth ) * nWidth;
-	long			nYPos = aPixPoint.Y() + ( ( aPixRect.Top() - aPixPoint.Y() ) / nHeight ) * nHeight;
-	const long		nBottom = aPixRect.Bottom();
-	const long		nRight = aPixRect.Right();
-	const long		nLeft = nXPos;
-	const sal_Bool		bNoSize = ( aPixSize == rBmpEx.GetSizePixel() );
-
-	pOutDev->Push();
-	pOutDev->SetMapMode( MapMode() );
-
-	// ggf. neue ClipRegion berechnen und setzen
-	if ( pOutDev->IsClipRegion() )
-		aPixRect.Intersection( aClipRect );
-
-	pOutDev->SetClipRegion( aPixRect );
-
-	while( nYPos <= nBottom )
-	{
-		while( nXPos <= nRight )
-		{
-			if ( bNoSize )
-				rBmpEx.Draw( pOutDev, Point( nXPos, nYPos ) );
-			else
-				rBmpEx.Draw( pOutDev, Point( nXPos, nYPos ), aPixSize );
-
-			nXPos += nWidth;
-		}
-
-		nXPos = nLeft;
-		nYPos += nHeight;
-	}
-
-	pOutDev->Pop();
-}
-
 // ------------------------------------------------------------------------
 
 Animation XOutBitmap::MirrorAnimation( const Animation& rAnimation, sal_Bool bHMirr, sal_Bool bVMirr )
@@ -577,8 +396,8 @@ Bitmap XOutBitmap::DetectEdges( const Bi
 				const long			nHeight = aSize.Height();
 				const long			nHeight2 = nHeight - 2L;
 				const long			lThres2 = (long) cThreshold * cThreshold;
-				const sal_uInt8 nWhitePalIdx = pWriteAcc->GetBestPaletteIndex( Color( COL_WHITE ) );
-				const sal_uInt8 nBlackPalIdx = pWriteAcc->GetBestPaletteIndex( Color( COL_BLACK ) );
+				const sal_uInt8 nWhitePalIdx(static_cast< sal_uInt8 >(pWriteAcc->GetBestPaletteIndex(Color(COL_WHITE))));
+				const sal_uInt8 nBlackPalIdx(static_cast< sal_uInt8 >(pWriteAcc->GetBestPaletteIndex(Color(COL_BLACK))));
 				long				nSum1;
 				long				nSum2;
 				long				lGray;

Modified: openoffice/branches/ia2/main/svx/source/xoutdev/xattrbmp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/xoutdev/xattrbmp.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/xoutdev/xattrbmp.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/xoutdev/xattrbmp.cxx Fri Feb  1 08:46:00 2013
@@ -42,6 +42,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <vcl/salbtype.hxx>
 #include <vcl/bmpacc.hxx>
+#include <vcl/dibtools.hxx>
 
 using namespace ::com::sun::star;
 
@@ -154,7 +155,7 @@ XFillBitmapItem::XFillBitmapItem(SvStrea
 		    // Behandlung der alten Bitmaps
 		    Bitmap aBmp;
 
-		    rIn >> aBmp;
+            ReadDIB(aBmp, rIn, true);
             maGraphicObject = Graphic(aBmp);
 	    }
 	    else if(1 == nVer)
@@ -174,7 +175,7 @@ XFillBitmapItem::XFillBitmapItem(SvStrea
 		    {
 			    Bitmap aBmp;
 
-                rIn >> aBmp;
+                ReadDIB(aBmp, rIn, true);
                 maGraphicObject = Graphic(aBmp);
 		    }
 		    else if(XBITMAP_8X8 == iTmp)
@@ -201,7 +202,7 @@ XFillBitmapItem::XFillBitmapItem(SvStrea
         {
 		    BitmapEx aBmpEx;
 
-		    rIn >> aBmpEx;
+            ReadDIBBitmapEx(aBmpEx, rIn);
             maGraphicObject = Graphic(aBmpEx);
         }
     }
@@ -253,7 +254,7 @@ SvStream& XFillBitmapItem::Store( SvStre
 
 	if(!IsIndex())
 	{
-        rOut << maGraphicObject.GetGraphic().GetBitmapEx();
+        WriteDIBBitmapEx(maGraphicObject.GetGraphic().GetBitmapEx(), rOut);
 	}
 
 	return rOut;

Modified: openoffice/branches/ia2/main/svx/source/xoutdev/xpool.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/svx/source/xoutdev/xpool.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/svx/source/xoutdev/xpool.cxx (original)
+++ openoffice/branches/ia2/main/svx/source/xoutdev/xpool.cxx Fri Feb  1 08:46:00 2013
@@ -48,11 +48,11 @@ XOutdevItemPool::XOutdevItemPool(
 	const XubString aNullStr;
 	const Graphic aNullGraphic;
 	const basegfx::B2DPolyPolygon aNullPol;
-	const Color aNullLineCol(RGB_Color(COL_BLACK));
-	const Color aNullFillCol(RGB_COLORDATA( 153, 204, 255 ));
+	const Color aNullLineCol(COL_DEFAULT_SHAPE_STROKE); // #121448# Use defined default color
+	const Color aNullFillCol(COL_DEFAULT_SHAPE_FILLING); // #121448# Use defined default color
 	const Color aNullShadowCol(RGB_Color(COL_LIGHTGRAY));
 	const XDash aNullDash;
-	const XGradient aNullGrad(aNullLineCol, RGB_Color(COL_WHITE));
+	const XGradient aNullGrad(RGB_Color(COL_BLACK), RGB_Color(COL_WHITE));
 	const XHatch aNullHatch(aNullLineCol);
 
 	// get master pointer, evtl. add myself to the end of the pools

Modified: openoffice/branches/ia2/main/sw/inc/IDocumentMarkAccess.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/IDocumentMarkAccess.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/IDocumentMarkAccess.hxx (original)
+++ openoffice/branches/ia2/main/sw/inc/IDocumentMarkAccess.hxx Fri Feb  1 08:46:00 2013
@@ -241,8 +241,8 @@ class IDocumentMarkAccess
         // Returns the MarkType used to create the mark
         static MarkType SAL_DLLPUBLIC_EXPORT GetType(const ::sw::mark::IMark& rMark);
 
-        static const ::rtl::OUString SAL_DLLPUBLIC_EXPORT & GetCrossRefHeadingBookmarkNamePrefix();
-        static const bool SAL_DLLPUBLIC_EXPORT IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM );
+        static SAL_DLLPUBLIC_EXPORT const ::rtl::OUString& GetCrossRefHeadingBookmarkNamePrefix();
+        static SAL_DLLPUBLIC_EXPORT bool IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& );
     protected:
         virtual ~IDocumentMarkAccess() {};
 };

Modified: openoffice/branches/ia2/main/sw/inc/doc.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/doc.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/doc.hxx (original)
+++ openoffice/branches/ia2/main/sw/inc/doc.hxx Fri Feb  1 08:46:00 2013
@@ -602,8 +602,6 @@ private:
 
     sal_Bool    mbStartIdleTimer                 ;    // idle timer mode start/stop
 
-	bool		mbSetDrawDefaults				 ;	  // set draw pool defaults for freshly created documents
-
 	static SwAutoCompleteWord *pACmpltWords;	// Liste aller Worte fuers AutoComplete
 
 	//---------------- private Methoden ------------------------------
@@ -2121,13 +2119,6 @@ public:
     ::sw::UndoManager      & GetUndoManager();
     ::sw::UndoManager const& GetUndoManager() const;
     SfxObjectShell* CreateCopy(bool bCallInitNew) const;
-
-	/// must be called only in SwDocShell::InitNew, causes UpdateDrawDefaults to be called when drawing layer is created
-	void SetDrawDefaults();
-
-private:
-	/// method to set new graphics pool defaults, must only be called by SetDrawDefaults!
-	void UpdateDrawDefaults();
 };
 
 

Modified: openoffice/branches/ia2/main/sw/inc/fmtclds.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/fmtclds.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/fmtclds.hxx (original)
+++ openoffice/branches/ia2/main/sw/inc/fmtclds.hxx Fri Feb  1 08:46:00 2013
@@ -101,7 +101,7 @@ public:
 	SwFmtCol( const SwFmtCol& );
 	~SwFmtCol();
 	//i120133
-	const	sal_Int16 GetAdjustValue() const { return aWidthAdjustValue; }
+	sal_Int16 GetAdjustValue() const { return aWidthAdjustValue; }
 	void	SetAdjustValue( const sal_Int16& n ) { aWidthAdjustValue = n; }
 
 	SwFmtCol& operator=( const SwFmtCol& );

Modified: openoffice/branches/ia2/main/sw/inc/pch/precompiled_sw.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/pch/precompiled_sw.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/pch/precompiled_sw.hxx (original)
+++ openoffice/branches/ia2/main/sw/inc/pch/precompiled_sw.hxx Fri Feb  1 08:46:00 2013
@@ -67,7 +67,6 @@
 #include "com/sun/star/accessibility/XAccessibleTable.hpp"
 #include "com/sun/star/accessibility/XAccessibleTextAttributes.hpp"
 #include "com/sun/star/accessibility/XAccessibleValue.hpp"
-#include "com/sun/star/awt/MessageBoxCommand.hpp"
 #include "com/sun/star/awt/PosSize.hpp"
 #include "com/sun/star/awt/ScrollBarOrientation.hpp"
 #include "com/sun/star/awt/Size.hpp"

Modified: openoffice/branches/ia2/main/sw/inc/viewopt.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/inc/viewopt.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/inc/viewopt.hxx (original)
+++ openoffice/branches/ia2/main/sw/inc/viewopt.hxx Fri Feb  1 08:46:00 2013
@@ -91,7 +91,7 @@ namespace svtools{ class ColorConfig;}
 #define VIEWOPT_2_GRFKEEPZOOM	    0x00040000L
 #define VIEWOPT_2_CONTENT_TIPS      0x00100000L
 #define VIEWOPT_2_RESERVED3         0x00200000L
-#define VIEWOPT_2_RESERVED4         0x00400000L
+#define VIEWOPT_2_SCROLLBAR_TIPS    0x00400000L
 #define VIEWOPT_2_PRTFORMAT         0x00800000L
 #define VIEWOPT_2_SHADOWCRSR        0x01000000L
 #define VIEWOPT_2_V_RULER_RIGHT     0x02000000L
@@ -474,6 +474,8 @@ public:
         { return nUIOptions & VIEWOPT_2_CONTENT_TIPS ? sal_True : sal_False; }
 	sal_Bool 	IsPrtFormat() const
 		{ return nUIOptions & VIEWOPT_2_PRTFORMAT ? sal_True : sal_False; }
+    sal_Bool    IsShowScrollBarTips() const
+        { return nUIOptions & VIEWOPT_2_SCROLLBAR_TIPS ? sal_True : sal_False; }
 
     SvxZoomType    GetZoomType()      const { return eZoom; }
 
@@ -491,6 +493,8 @@ public:
         { b ? (nUIOptions |= VIEWOPT_2_CONTENT_TIPS) : (nUIOptions &= ~VIEWOPT_2_CONTENT_TIPS); }
     void SetPrtFormat( sal_Bool b)
         { b ? (nUIOptions |= VIEWOPT_2_PRTFORMAT) : (nUIOptions &= ~VIEWOPT_2_PRTFORMAT); }
+    void SetShowScrollBarTips( sal_Bool b)
+        { b ? (nUIOptions |= VIEWOPT_2_SCROLLBAR_TIPS) : (nUIOptions &= ~VIEWOPT_2_SCROLLBAR_TIPS); }
 
     void            SetZoomType     (SvxZoomType eZoom_){ eZoom = eZoom_;  }
 	void   			SetTblDest( sal_uInt8 nNew )  	{ nTblDest = nNew;  }

Modified: openoffice/branches/ia2/main/sw/source/core/access/accpara.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/access/accpara.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/access/accpara.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/access/accpara.cxx Fri Feb  1 08:46:00 2013
@@ -758,6 +758,7 @@ sal_Bool SwAccessibleParagraph::GetGlyph
         rBound.startPos = pBreakIt->GetBreakIter()->previousCharacters(
              rText, rBound.endPos, aLocale, nIterMode, 1, nDone );
 
+        bRet = ((rBound.startPos <= nPos) && (nPos <= rBound.endPos));
         DBG_ASSERT( rBound.startPos <= nPos, "start pos too high" );
         DBG_ASSERT( rBound.endPos >= nPos, "end pos too low" );
     }

Modified: openoffice/branches/ia2/main/sw/source/core/bastyp/calc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/bastyp/calc.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/bastyp/calc.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/bastyp/calc.cxx Fri Feb  1 08:46:00 2013
@@ -1760,7 +1760,7 @@ double SwSbxValue::GetDouble() const
 
 SwSbxValue& SwSbxValue::MakeDouble()
 {
-	if( SbxSTRING == GetType() )
+	if( SbxSTRING == GetType() || SbxBOOL == GetType() )
 		PutDouble( GetDouble() );
 	return *this;
 }

Modified: openoffice/branches/ia2/main/sw/source/core/crsr/viscrs.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/crsr/viscrs.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/crsr/viscrs.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/crsr/viscrs.cxx Fri Feb  1 08:46:00 2013
@@ -591,26 +591,9 @@ void SwSelPaintRects::Show()
 
 			if(pTargetOverlay)
 			{
-                // #i97672# get the system's hilight color and limit it to the maximum
-                // allowed luminance. This is needed to react on too bright hilight colors
-                // which would otherwise vive a bad visualisation
-                const OutputDevice *pOut = Application::GetDefaultDevice();
-			    Color aHighlight(pOut->GetSettings().GetStyleSettings().GetHighlightColor());
-			    const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
-                const basegfx::BColor aSelection(aHighlight.getBColor());
-                const double fLuminance(aSelection.luminance());
-                const double fMaxLum(aSvtOptionsDrawinglayer.GetSelectionMaximumLuminancePercent() / 100.0);
-
-                if(fLuminance > fMaxLum)
-                {
-                    const double fFactor(fMaxLum / fLuminance);
-                    const basegfx::BColor aNewSelection(
-                        aSelection.getRed() * fFactor,
-                        aSelection.getGreen() * fFactor,
-                        aSelection.getBlue() * fFactor);
-
-                    aHighlight = Color(aNewSelection);
-                }
+                // get the system's hilight color
+                const SvtOptionsDrawinglayer aSvtOptionsDrawinglayer;
+                const Color aHighlight(aSvtOptionsDrawinglayer.getHilightColor());
 
 				// create correct selection
 				mpCursorOverlay = new sdr::overlay::OverlaySelection(

Modified: openoffice/branches/ia2/main/sw/source/core/doc/docbm.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/doc/docbm.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/doc/docbm.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/doc/docbm.cxx Fri Feb  1 08:46:00 2013
@@ -302,7 +302,7 @@ const ::rtl::OUString& IDocumentMarkAcce
     return CrossRefHeadingBookmarkNamePrefix;
 }
 
-const bool SAL_DLLPUBLIC_EXPORT IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM )
+bool SAL_DLLPUBLIC_EXPORT IDocumentMarkAccess::IsLegalPaMForCrossRefHeadingBookmark( const SwPaM& rPaM )
 {
     bool bRet( false );
 

Modified: openoffice/branches/ia2/main/sw/source/core/doc/docdraw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/doc/docdraw.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/doc/docdraw.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/doc/docdraw.cxx Fri Feb  1 08:46:00 2013
@@ -705,8 +705,6 @@ void SwDoc::InitDrawModel()
             pViewSh = (ViewShell*)pViewSh->GetNext();
         }while( pViewSh != pCurrentView );
 	}
-
-	UpdateDrawDefaults();
 }
 
 /** method to notify drawing page view about the invisible layers
@@ -1099,16 +1097,4 @@ namespace docfunc
 }
 // <--
 
-void SwDoc::SetDrawDefaults()
-{
-    mbSetDrawDefaults = true;
-    UpdateDrawDefaults();
-}
-
-void SwDoc::UpdateDrawDefaults()
-{
-    // drawing layer defaults that are set for new documents (if InitNew was called)
-    if ( pDrawModel && mbSetDrawDefaults )
-		pDrawModel->SetDrawingLayerPoolDefaults();
-}
-
+// eof

Modified: openoffice/branches/ia2/main/sw/source/core/doc/docnew.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/doc/docnew.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/doc/docnew.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/doc/docnew.cxx Fri Feb  1 08:46:00 2013
@@ -299,7 +299,6 @@ SwDoc::SwDoc()
     n32DummyCompatabilityOptions1(0),
     n32DummyCompatabilityOptions2(0),
     mbStartIdleTimer(sal_False),
-    mbSetDrawDefaults(false),
     meDocType( DOCTYPE_NATIVE )
 {
 	RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "SW", "JP93722",  "SwDoc::SwDoc" );

Modified: openoffice/branches/ia2/main/sw/source/core/text/portxt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/text/portxt.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/text/portxt.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/text/portxt.cxx Fri Feb  1 08:46:00 2013
@@ -49,6 +49,7 @@
 #include <pam.hxx>
 #include <doc.hxx>
 #include <xmloff/odffields.hxx>
+#include <vcl/pdfextoutdevdata.hxx>
 
 #if OSL_DEBUG_LEVEL > 1
 const sal_Char *GetLangName( const MSHORT nLang );
@@ -739,13 +740,34 @@ SwLinePortion *SwHolePortion::Compress()
 
 void SwHolePortion::Paint( const SwTxtPaintInfo &rInf ) const
 {
-    // --> FME 2004-06-24 #i16816# tagged pdf support
-    if( rInf.GetVsh() && rInf.GetVsh()->GetViewOptions()->IsPDFExport() )
-    {
-        const XubString aTxt( ' ' );
-        rInf.DrawText( aTxt, *this, 0, 1, false );
+    if( !rInf.GetOut() )
+        return;
+
+    // #i16816# export stuff only needed for tagged pdf support
+    const vcl::PDFExtOutDevData* pPDFExt = dynamic_cast<const vcl::PDFExtOutDevData*>( rInf.GetOut()->GetExtOutDevData() );
+    if( !pPDFExt || !pPDFExt->GetIsExportTaggedPDF())
+        return;
+
+    // #i68503# the hole must have no decoration for a consistent visual appearance
+    const SwFont* pOrigFont = rInf.GetFont();
+    SwFont* pHoleFont = NULL;
+    SwFontSave* pFontSave = NULL;
+    if( pOrigFont->GetUnderline() != UNDERLINE_NONE
+    ||  pOrigFont->GetOverline() != UNDERLINE_NONE
+    ||  pOrigFont->GetStrikeout() != STRIKEOUT_NONE )
+    {
+        pHoleFont = new SwFont( *pOrigFont );
+        pHoleFont->SetUnderline( UNDERLINE_NONE );
+        pHoleFont->SetOverline( UNDERLINE_NONE );
+        pHoleFont->SetStrikeout( STRIKEOUT_NONE );
+        pFontSave = new SwFontSave( rInf, pHoleFont );
     }
-    // <--
+
+    const XubString aTxt( ' ' );
+    rInf.DrawText( aTxt, *this, 0, 1, false );
+
+    delete pFontSave;
+    delete pHoleFont;
 }
 
 /*************************************************************************

Modified: openoffice/branches/ia2/main/sw/source/core/view/viewsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/core/view/viewsh.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/core/view/viewsh.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/core/view/viewsh.cxx Fri Feb  1 08:46:00 2013
@@ -19,25 +19,18 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #define _SVX_PARAITEM_HXX
 #define _SVX_TEXTITEM_HXX
 
 #include <com/sun/star/accessibility/XAccessible.hpp>
-
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/progress.hxx>
 #include <svx/srchdlg.hxx>
 #include <svx/svdobj.hxx>
 #include <sfx2/viewsh.hxx>
-#ifndef _SHL_HXX
-//#include <tools/shl.hxx>
-#endif
 #include <swwait.hxx>
 #include <swmodule.hxx>
 #include <fesh.hxx>
@@ -59,9 +52,7 @@
 #include <fntcache.hxx>
 #include <ptqueue.hxx>
 #include <tabfrm.hxx>
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
 #include <pagedesc.hxx>
 #include <ndole.hxx>
 #include <ndindex.hxx>
@@ -69,27 +60,17 @@
 #include <svtools/colorcfg.hxx>
 #include <svtools/accessibilityoptions.hxx>
 #include <accessibilityoptions.hxx>
-#ifndef _STATSTR_HRC
 #include <statstr.hrc>
-#endif
-#ifndef _COMCORE_HRC
 #include <comcore.hrc>
-#endif
-// OD 14.01.2003 #103492#
 #include <pagepreviewlayout.hxx>
-// --> OD 2004-05-24 #i28701#
 #include <sortedobjs.hxx>
 #include <anchoredobject.hxx>
-// <--
-
 #include "../../ui/inc/view.hxx"
 #include <PostItMgr.hxx>
 #include <vcl/virdev.hxx>
-
 #include <vcl/svapp.hxx>
-
-// #i74769#
 #include <svx/sdrpaintwindow.hxx>
+#include <vcl/dibtools.hxx>
 
 sal_Bool ViewShell::bLstAct = sal_False;
 ShellResource *ViewShell::pShellRes = 0;
@@ -1447,7 +1428,7 @@ sal_Bool ViewShell::SmoothScroll( long l
 					const Bitmap aBitmap(pVout->GetBitmap(Point(), pVout->GetOutputSizePixel()));
                     const String aTmpString(ByteString( "c:\\test.bmp" ), RTL_TEXTENCODING_UTF8);
                     SvFileStream aNew(aTmpString, STREAM_WRITE|STREAM_TRUNC);
-					aNew << aBitmap;
+                    WriteDIB(aBitmap, aNew, false, true);
 					pVout->EnableMapMode(bMapModeWasEnabledVDev);
 				}
 			}

Modified: openoffice/branches/ia2/main/sw/source/filter/inc/fltshell.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/filter/inc/fltshell.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/filter/inc/fltshell.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/filter/inc/fltshell.hxx Fri Feb  1 08:46:00 2013
@@ -259,7 +259,7 @@ public:
     long GetHandle() const 				{ return mnHandle; }
     const String& GetName() const 		{ return maName; }
     const String& GetValSys() const 	{ return maVal; }
-    const bool IsTOCBookmark() const
+    bool IsTOCBookmark() const
     {
         return mbIsTOCBookmark;
     }

Modified: openoffice/branches/ia2/main/sw/source/filter/ww1/w1filter.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/filter/ww1/w1filter.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/filter/ww1/w1filter.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/filter/ww1/w1filter.cxx Fri Feb  1 08:46:00 2013
@@ -19,28 +19,21 @@
  * 
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 #include <hintids.hxx>
-
 #include <tools/solar.h>
 #include <comphelper/string.hxx>
 #include <editeng/paperinf.hxx>
 #include <svtools/filter.hxx>
-#ifndef _GRAPH_HXX //autogen
 #include <vcl/graph.hxx>
-#endif
 #include <editeng/fontitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/ulspitem.hxx>
 #include <editeng/wghtitem.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/crsditem.hxx>
-#ifndef _SVX_CNTRITEM_HXX //autogen
 #include <editeng/cntritem.hxx>
-#endif
 #include <editeng/cmapitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/udlnitem.hxx>
@@ -48,9 +41,7 @@
 #include <editeng/colritem.hxx>
 #include <editeng/kernitem.hxx>
 #include <editeng/escpitem.hxx>
-#ifndef _SVX_TSTPITEM_HXX //autogen
 #include <editeng/tstpitem.hxx>
-#endif
 #include <svl/urihelper.hxx>
 #include <fmtfsize.hxx>
 #include <doc.hxx>
@@ -65,19 +56,14 @@
 #include <section.hxx>			// class SwSection
 #include <fltini.hxx>
 #include <w1par.hxx>
-
 #include <docsh.hxx>
 #include <swerror.h>
 #include <mdiexp.hxx>
-#ifndef _STATSTR_HRC
 #include <statstr.hrc>
-#endif
-#if OSL_DEBUG_LEVEL > 1
 #include <stdio.h>
-#endif
-
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
+#include <vcl/dibtools.hxx>
 
 #define MAX_FIELDLEN 64000
 
@@ -1970,7 +1956,7 @@ void Ww1Picture::Out(Ww1Shell& rOut, Ww1
 		SvMemoryStream aOut(nSiz, 8192);
 		WriteBmp(aOut);
 		Bitmap aBmp;
-		aOut >> aBmp;
+        ReadDIB(aBmp, aOut, true);
 		pGraphic = new Graphic(aBmp);
 	}
 	default:

Modified: openoffice/branches/ia2/main/sw/source/filter/ww8/ww8par.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/filter/ww8/ww8par.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/filter/ww8/ww8par.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/filter/ww8/ww8par.hxx Fri Feb  1 08:46:00 2013
@@ -192,7 +192,7 @@ public:
     SwNumRule* CreateNextRule(bool bSimple);
     ~WW8ListManager();
 	SwNumRule* GetNumRule(sal_uInt16 i);	
-	sal_uInt16 GetWW8LSTInfoNum() const{return maLSTInfos.size();}
+	sal_uInt16 GetWW8LSTInfoNum() const{return static_cast< sal_uInt16 >(maLSTInfos.size());}
 private:
     wwSprmParser maSprmParser;
     SwWW8ImplReader& rReader;

Modified: openoffice/branches/ia2/main/sw/source/ui/app/docshini.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/app/docshini.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/app/docshini.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/app/docshini.cxx Fri Feb  1 08:46:00 2013
@@ -347,8 +347,6 @@ sal_Bool SwDocShell::InitNew( const uno:
     //#i16874# AutoKerning as default for new documents
     pDoc->SetDefault( SvxAutoKernItem( sal_True, RES_CHRATR_AUTOKERN ) );
 
-	pDoc->SetDrawDefaults();
-
     // --> OD 2005-02-10 #i42080# - Due to the several calls of method <SetDefault(..)>
     // at the document instance, the document is modified. Thus, reset this
     // status here. Note: In method <SubInitNew()> this is also done.

Modified: openoffice/branches/ia2/main/sw/source/ui/config/usrpref.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/config/usrpref.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/config/usrpref.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/config/usrpref.cxx Fri Feb  1 08:46:00 2013
@@ -261,9 +261,10 @@ Sequence<OUString> SwLayoutViewConfig::G
         "Window/IsVerticalRulerRight",          //16
         "ViewLayout/Columns",                   //17
         "ViewLayout/BookMode",                  //18
-        "Other/IsSquaredPageMode"               //19
+        "Other/IsSquaredPageMode",              //19
+        "Window/ShowScrollBarTips"              //20
     };
-    const int nCount = bWeb ? 15 : 20;
+    const int nCount = bWeb ? 15 : 21;
     Sequence<OUString> aNames(nCount);
 	OUString* pNames = aNames.getArray();
 	for(int i = 0; i < nCount; i++)
@@ -331,6 +332,7 @@ void SwLayoutViewConfig::Commit()
             case 17: rVal <<= (sal_Int32)rParent.GetViewLayoutColumns(); break;     // "ViewLayout/Columns",
             case 18: rVal <<= (sal_Bool) rParent.IsViewLayoutBookMode(); break;     // "ViewLayout/BookMode",
             case 19: rVal <<= (sal_Bool) rParent.IsSquaredPageMode(); break;        // "Other/IsSquaredPageMode",
+            case 20: rVal <<= (sal_Bool) rParent.IsShowScrollBarTips(); break;      // "Window/ShowScrollBarTips",
         }
 	}
 	PutProperties(aNames, aValues);
@@ -387,6 +389,7 @@ void SwLayoutViewConfig::Load()
                     case 17: rParent.SetViewLayoutColumns( static_cast<sal_uInt16>(nInt32Val) ); break;// "ViewLayout/Columns",
                     case 18: rParent.SetViewLayoutBookMode(bSet); break;// "ViewLayout/BookMode",
                     case 19: rParent.SetDefaultPageMode(bSet,sal_True); break;// "Other/IsSquaredPageMode",
+                    case 20: rParent.SetShowScrollBarTips(bSet); break;// "Window/ShowScrollBarTips",
                 }
 			}
 		}

Modified: openoffice/branches/ia2/main/sw/source/ui/config/viewopt.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/config/viewopt.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/config/viewopt.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/config/viewopt.cxx Fri Feb  1 08:46:00 2013
@@ -223,14 +223,27 @@ SwViewOption::SwViewOption() :
 {
 	// Initialisierung ist jetzt etwas einfacher
 	// alle Bits auf 0
-    nCoreOptions =  VIEWOPT_1_HARDBLANK | VIEWOPT_1_SOFTHYPH |
-                    VIEWOPT_1_REF |
-                    VIEWOPT_1_GRAPHIC |
-					VIEWOPT_1_TABLE	   | VIEWOPT_1_DRAW | VIEWOPT_1_CONTROL	|
-                    VIEWOPT_1_PAGEBACK |
-					VIEWOPT_1_SOLIDMARKHDL | VIEWOPT_1_POSTITS;
-    nCore2Options = VIEWOPT_CORE2_BLACKFONT | VIEWOPT_CORE2_HIDDENPARA;
-    nUIOptions    = VIEWOPT_2_MODIFIED | VIEWOPT_2_GRFKEEPZOOM |VIEWOPT_2_ANY_RULER;
+    nCoreOptions =  
+        VIEWOPT_1_HARDBLANK | 
+        VIEWOPT_1_SOFTHYPH |
+        VIEWOPT_1_REF |
+        VIEWOPT_1_GRAPHIC |
+        VIEWOPT_1_TABLE | 
+        VIEWOPT_1_DRAW | 
+        VIEWOPT_1_CONTROL |
+        VIEWOPT_1_PAGEBACK |
+        VIEWOPT_1_SOLIDMARKHDL | // default is enhanced handles
+        VIEWOPT_1_POSTITS;
+    
+    nCore2Options = 
+        VIEWOPT_CORE2_BLACKFONT | 
+        VIEWOPT_CORE2_HIDDENPARA |
+        VIEWOPT_CORE2_BIGMARKHDL; // default is big handles
+    
+    nUIOptions = 
+        VIEWOPT_2_MODIFIED | 
+        VIEWOPT_2_GRFKEEPZOOM |
+        VIEWOPT_2_ANY_RULER;
 
 	if(MEASURE_METRIC != SvtSysLocale().GetLocaleData().getMeasurementSystemEnum())
 		aSnapSize.Width() = aSnapSize.Height() = 720;	// 1/2"

Modified: openoffice/branches/ia2/main/sw/source/ui/dochdl/swdtflvr.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/dochdl/swdtflvr.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/dochdl/swdtflvr.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/dochdl/swdtflvr.cxx Fri Feb  1 08:46:00 2013
@@ -540,11 +540,10 @@ sal_Bool SwTransferable::GetData( const 
 				bOK = SetGDIMetaFile( pClpGraphic->GetGDIMetaFile(), rFlavor );
 			break;
 		case SOT_FORMAT_BITMAP:
+        case SOT_FORMATSTR_ID_PNG:
             // #126398#  Neither pClpBitmap nor pClpGraphic are necessarily set
             if( (eBufferType & TRNSFR_GRAPHIC) && (pClpBitmap != 0 || pClpGraphic != 0))
-				bOK = SetBitmap( (pClpBitmap ? pClpBitmap
-											 : pClpGraphic)->GetBitmap(),
-								 rFlavor );
+				bOK = SetBitmapEx( (pClpBitmap ? pClpBitmap : pClpGraphic)->GetBitmapEx(), rFlavor );
 			break;
 
 		case SOT_FORMATSTR_ID_SVIM:
@@ -794,6 +793,7 @@ int SwTransferable::PrepareForCopy( sal_
         // <--
 		{
 			AddFormat( FORMAT_GDIMETAFILE );
+            AddFormat( SOT_FORMATSTR_ID_PNG );
 			AddFormat( FORMAT_BITMAP );
 		}
 		eBufferType = TRNSFR_GRAPHIC;
@@ -900,6 +900,7 @@ int SwTransferable::PrepareForCopy( sal_
 			if ( nSelection & nsSelectionType::SEL_DRW )
 			{
 				AddFormat( FORMAT_GDIMETAFILE );
+                AddFormat( SOT_FORMATSTR_ID_PNG );
 				AddFormat( FORMAT_BITMAP );
 			}
 			eBufferType = (TransferBufferType)( TRNSFR_GRAPHIC | eBufferType );
@@ -2990,6 +2991,7 @@ void SwTransferable::SetDataForDragAndDr
         // <--
 		{
 			AddFormat( FORMAT_GDIMETAFILE );
+            AddFormat( SOT_FORMATSTR_ID_PNG );
 			AddFormat( FORMAT_BITMAP );
 		}
 		eBufferType = TRNSFR_GRAPHIC;
@@ -3039,6 +3041,7 @@ void SwTransferable::SetDataForDragAndDr
 			if ( nSelection & nsSelectionType::SEL_DRW )
 			{
 				AddFormat( FORMAT_GDIMETAFILE );
+                AddFormat( SOT_FORMATSTR_ID_PNG );
 				AddFormat( FORMAT_BITMAP );
 			}
 			eBufferType = (TransferBufferType)( TRNSFR_GRAPHIC | eBufferType );

Modified: openoffice/branches/ia2/main/sw/source/ui/docvw/edtwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/docvw/edtwin.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/docvw/edtwin.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/docvw/edtwin.cxx Fri Feb  1 08:46:00 2013
@@ -206,6 +206,7 @@ public:
     void SetPos( const Point& rNew ) { pHdl->SetPos( rNew ); }
     const Point& GetPos() { return pHdl->GetPos(); }
     const Point& GetHdlPos() { return aHdlPos; }
+    SdrHdl* GetHdl() const { return pHdl; }
     void ChgHdl( SdrHdl* pNew ) 
     { 
         pHdl = pNew;
@@ -2881,6 +2882,8 @@ void SwEditWin::MouseButtonDown(const Mo
                             ( pHdl->GetKind() == HDL_ANCHOR ||
                               pHdl->GetKind() == HDL_ANCHOR_TR ) )
                     {
+                        // #121463# Set selected during drag
+                        pHdl->SetSelected(true);
                         pAnchorMarker = new SwAnchorMarker( pHdl );
                         UpdatePointer( aDocPos, rMEvt.GetModifier() );
                         return;
@@ -4069,6 +4072,12 @@ void SwEditWin::MouseButtonUp(const Mous
 
     if( pAnchorMarker )
     {
+        if(pAnchorMarker->GetHdl())
+        {
+            // #121463# delete selected after drag
+            pAnchorMarker->GetHdl()->SetSelected(false);
+        }
+
         Point aPnt( pAnchorMarker->GetLastPos() );
         //OLMpSdrView->RefreshAllIAOManagers();
         DELETEZ( pAnchorMarker );

Modified: openoffice/branches/ia2/main/sw/source/ui/envelp/labimp.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/envelp/labimp.hxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/envelp/labimp.hxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/envelp/labimp.hxx Fri Feb  1 08:46:00 2013
@@ -71,7 +71,6 @@
 #include <com/sun/star/awt/XComboBox.hpp>
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/awt/XCheckBox.hpp>
-#include <com/sun/star/awt/MessageBoxCommand.hpp>
 #include <com/sun/star/awt/XLayoutConstrains.hpp>
 #include <com/sun/star/awt/XProgressBar.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>

Modified: openoffice/branches/ia2/main/sw/source/ui/uiview/viewport.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/uiview/viewport.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/uiview/viewport.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/uiview/viewport.cxx Fri Feb  1 08:46:00 2013
@@ -717,51 +717,55 @@ IMPL_LINK( SwView, ScrollHdl, SwScrollba
 		// 				so we dont must do it agin.
 		EndScrollHdl(pScrollbar);
 
-		Point aPos( aVisArea.TopLeft() );
-		lcl_GetPos(this, aPos, pScrollbar, IsDocumentBorder());
+		if ( Help::IsQuickHelpEnabled() &&
+             pWrtShell->GetViewOptions()->IsShowScrollBarTips())
+        {
+            Point aPos( aVisArea.TopLeft() );
+            lcl_GetPos(this, aPos, pScrollbar, IsDocumentBorder());
 
-		sal_uInt16 nPhNum = 1;
-		sal_uInt16 nVirtNum = 1;
+            sal_uInt16 nPhNum = 1;
+            sal_uInt16 nVirtNum = 1;
 
-		String sDisplay;
-		if(pWrtShell->GetPageNumber( aPos.Y(), sal_False, nPhNum, nVirtNum, sDisplay ))
-		{
-			// JP 21.07.00: the end scrollhandler invalidate the FN_STAT_PAGE,
-			// 				so we dont must do it agin.
-//          if(!GetViewFrame()->GetFrame().IsInPlace())
-//				S F X_BINDINGS().Update(FN_STAT_PAGE);
+            String sDisplay;
+            if(pWrtShell->GetPageNumber( aPos.Y(), sal_False, nPhNum, nVirtNum, sDisplay ))
+            {
+                // JP 21.07.00: the end scrollhandler invalidate the FN_STAT_PAGE,
+                //                 so we dont must do it agin.
+    //          if(!GetViewFrame()->GetFrame().IsInPlace())
+    //                S F X_BINDINGS().Update(FN_STAT_PAGE);
+
+                //QuickHelp:
+                if( pWrtShell->GetPageCnt() > 1 )
+                {
+                    if( !nPgNum || nPgNum != nPhNum )
+                    {
+                        Rectangle aRect;
+                        aRect.Left() = pScrollbar->GetParent()->OutputToScreenPixel(
+                                            pScrollbar->GetPosPixel() ).X() -8;
+                        aRect.Top() = pScrollbar->OutputToScreenPixel(
+                                        pScrollbar->GetPointerPosPixel() ).Y();
+                        aRect.Right()     = aRect.Left();
+                        aRect.Bottom()    = aRect.Top();
+
+                        String sPageStr( GetPageStr( nPhNum, nVirtNum, sDisplay ));
+                        SwContentAtPos aCnt( SwContentAtPos::SW_OUTLINE );
+                        pWrtShell->GetContentAtPos( aPos, aCnt );
+                        if( aCnt.sStr.Len() )
+                        {
+                            sPageStr += String::CreateFromAscii(
+                                            RTL_CONSTASCII_STRINGPARAM( "  - " ));
+                            sPageStr.Insert( aCnt.sStr, 0, 80 );
+                            sPageStr.SearchAndReplaceAll( '\t', ' ' );
+                            sPageStr.SearchAndReplaceAll( 0x0a, ' ' );
+                        }
 
-			//QuickHelp:
-            if( pWrtShell->GetPageCnt() > 1 && Help::IsQuickHelpEnabled() )
-			{
-				if( !nPgNum || nPgNum != nPhNum )
-				{
-					Rectangle aRect;
-					aRect.Left() = pScrollbar->GetParent()->OutputToScreenPixel(
-										pScrollbar->GetPosPixel() ).X() -8;
-					aRect.Top() = pScrollbar->OutputToScreenPixel(
-									pScrollbar->GetPointerPosPixel() ).Y();
-					aRect.Right() 	= aRect.Left();
-					aRect.Bottom()	= aRect.Top();
-
-					String sPageStr( GetPageStr( nPhNum, nVirtNum, sDisplay ));
-					SwContentAtPos aCnt( SwContentAtPos::SW_OUTLINE );
-					pWrtShell->GetContentAtPos( aPos, aCnt );
-					if( aCnt.sStr.Len() )
-					{
-						sPageStr += String::CreateFromAscii(
-										RTL_CONSTASCII_STRINGPARAM( "  - " ));
-						sPageStr.Insert( aCnt.sStr, 0, 80 );
-						sPageStr.SearchAndReplaceAll( '\t', ' ' );
-                        sPageStr.SearchAndReplaceAll( 0x0a, ' ' );
+                        Help::ShowQuickHelp( pScrollbar, aRect, sPageStr,
+                                        QUICKHELP_RIGHT|QUICKHELP_VCENTER);
                     }
-
-					Help::ShowQuickHelp( pScrollbar, aRect, sPageStr,
-									QUICKHELP_RIGHT|QUICKHELP_VCENTER);
-				}
-				nPgNum = nPhNum;
-			}
-		}
+                    nPgNum = nPhNum;
+                }
+            }
+        }
 	}
 	else
 		EndScrollHdl(pScrollbar);

Modified: openoffice/branches/ia2/main/sw/source/ui/uno/unomod.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sw/source/ui/uno/unomod.cxx?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sw/source/ui/uno/unomod.cxx (original)
+++ openoffice/branches/ia2/main/sw/source/ui/uno/unomod.cxx Fri Feb  1 08:46:00 2013
@@ -100,7 +100,8 @@ enum SwViewSettingsPropertyHandles
     HANDLE_VIEWSET_RASTER_SUBDIVISION_X,
     HANDLE_VIEWSET_RASTER_SUBDIVISION_Y,
     HANDLE_VIEWSET_HORI_RULER_METRIC,
-    HANDLE_VIEWSET_VERT_RULER_METRIC
+    HANDLE_VIEWSET_VERT_RULER_METRIC,
+    HANDLE_VIEWSET_SCROLLBAR_TIPS
 };
 enum SwPrintSettingsPropertyHandles
 {
@@ -155,6 +156,7 @@ static ChainablePropertySetInfo * lcl_cr
 		{ RTL_CONSTASCII_STRINGPARAM ( "ShowParaBreaks"),		HANDLE_VIEWSET_PARA_BREAKS          , CPPUTYPE_BOOLEAN,	PROPERTY_NONE,	0},
 		{ RTL_CONSTASCII_STRINGPARAM ( "ShowProtectedSpaces"),	HANDLE_VIEWSET_PROTECTED_SPACES     , CPPUTYPE_BOOLEAN,	PROPERTY_NONE,	0},
         { RTL_CONSTASCII_STRINGPARAM ( "ShowRulers"),           HANDLE_VIEWSET_SHOW_RULER           , CPPUTYPE_BOOLEAN, PROPERTY_NONE,  0},
+        { RTL_CONSTASCII_STRINGPARAM ( "ShowScrollBarTips"),    HANDLE_VIEWSET_SCROLLBAR_TIPS       , CPPUTYPE_BOOLEAN, PROPERTY_NONE,  0},
 		{ RTL_CONSTASCII_STRINGPARAM ( "ShowSoftHyphens"),		HANDLE_VIEWSET_SOFT_HYPHENS         , CPPUTYPE_BOOLEAN,	PROPERTY_NONE,	0},
 		{ RTL_CONSTASCII_STRINGPARAM ( "ShowSpaces"),			HANDLE_VIEWSET_SPACES               , CPPUTYPE_BOOLEAN,	PROPERTY_NONE,	0},
 		{ RTL_CONSTASCII_STRINGPARAM ( "ShowTableBoundaries"),	HANDLE_VIEWSET_TABLE_BOUNDARIES     , CPPUTYPE_BOOLEAN,	PROPERTY_NONE,	0},
@@ -689,6 +691,7 @@ void SwXViewSettings::_setSingleValue( c
         case  HANDLE_VIEWSET_SHOW_CONTENT_TIPS     :   mpViewOption->SetShowContentTips(bVal); break;
         case  HANDLE_VIEWSET_IS_RASTER_VISIBLE     : mpViewOption->SetGridVisible(bVal); break;
         case  HANDLE_VIEWSET_IS_SNAP_TO_RASTER     : mpViewOption->SetSnap(bVal); break;
+        case  HANDLE_VIEWSET_SCROLLBAR_TIPS        : mpViewOption->SetShowScrollBarTips(bVal); break;
         case  HANDLE_VIEWSET_RASTER_RESOLUTION_X   :
         {
             sal_Int32 nTmp = 0;
@@ -920,6 +923,7 @@ void SwXViewSettings::_getSingleValue( c
         case  HANDLE_VIEWSET_SHOW_CONTENT_TIPS     :   bBoolVal = mpConstViewOption->IsShowContentTips(); break;
         case  HANDLE_VIEWSET_IS_RASTER_VISIBLE     : bBoolVal = mpConstViewOption->IsGridVisible(); break;
         case  HANDLE_VIEWSET_IS_SNAP_TO_RASTER     : bBoolVal = mpConstViewOption->IsSnap(); break;
+        case  HANDLE_VIEWSET_SCROLLBAR_TIPS        : bBoolVal = mpConstViewOption->IsShowScrollBarTips(); break;
         case  HANDLE_VIEWSET_RASTER_RESOLUTION_X   :
             bBool = sal_False;
             rValue <<= (sal_Int32) TWIP_TO_MM100(mpConstViewOption->GetSnapSize().Width());

Modified: openoffice/branches/ia2/main/swext/mediawiki/build.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/swext/mediawiki/build.xml?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/swext/mediawiki/build.xml (original)
+++ openoffice/branches/ia2/main/swext/mediawiki/build.xml Fri Feb  1 08:46:00 2013
@@ -72,7 +72,7 @@
 
     <target name="compile" depends="init">
         <javac debug="${debug}" debuglevel="lines,vars,source" destdir="${classes}" classpathref="classpath"
-               source="${sourcelevel}" verbose="${verbose}">
+               source="${sourcelevel}" verbose="${verbose}" includeantruntime="false">
             <src path="src"/>
         </javac>
     </target>

Modified: openoffice/branches/ia2/main/swext/mediawiki/help/component.txt
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/swext/mediawiki/help/component.txt?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/swext/mediawiki/help/component.txt (original)
+++ openoffice/branches/ia2/main/swext/mediawiki/help/component.txt Fri Feb  1 08:46:00 2013
@@ -1,21 +1 @@
-# *************************************************************
-#  
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#  
-#    http://www.apache.org/licenses/LICENSE-2.0
-#  
-#  Unless required by applicable law or agreed to in writing,
-#  software distributed under the License is distributed on an
-#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-#  KIND, either express or implied.  See the License for the
-#  specific language governing permissions and limitations
-#  under the License.
-#  
-# *************************************************************
 The @WIKIEXTENSIONPRODUCTNAME@ enables you to create Wiki articles on MediaWiki servers without having to know the syntax of the MediaWiki markup language. Publish your new and existing documents transparently with the Writer to a wiki page.

Modified: openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java (original)
+++ openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/Helper.java Fri Feb  1 08:46:00 2013
@@ -24,6 +24,7 @@
 package com.sun.star.wiki;
 
 import com.sun.star.awt.MessageBoxButtons;
+import com.sun.star.awt.MessageBoxType;
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XControlContainer;
 import com.sun.star.awt.XDialog;
@@ -701,8 +702,7 @@ public class Helper 
         {
             try
             {
-                Object oSystemShell = xContext.getServiceManager().createInstanceWithContext( "com.sun.star.system.SystemShellExecute", xContext );
-                XSystemShellExecute xSystemShell = (XSystemShellExecute)UnoRuntime.queryInterface( XSystemShellExecute.class, oSystemShell );
+                XSystemShellExecute xSystemShell = com.sun.star.system.SystemShellExecute.create( xContext );
                 if ( xSystemShell != null )
                     xSystemShell.execute( sURL, "", SystemShellExecuteFlags.DEFAULTS );
             }
@@ -1008,8 +1008,7 @@ public class Helper 
                         {
                             xMB = xMBFactory.createMessageBox(
                                                      xParentPeer,
-                                                     new com.sun.star.awt.Rectangle(),
-                                                     "querybox",
+                                                     MessageBoxType.QUERYBOX,
                                                      MessageBoxButtons.BUTTONS_YES_NO | MessageBoxButtons.DEFAULT_BUTTON_NO,
                                                      sTitle,
                                                      sError );
@@ -1018,8 +1017,7 @@ public class Helper 
                         {
                             xMB = xMBFactory.createMessageBox(
                                                      xParentPeer,
-                                                     new com.sun.star.awt.Rectangle(),
-                                                     "errorbox",
+                                                     MessageBoxType.ERRORBOX,
                                                      MessageBoxButtons.BUTTONS_OK,
                                                      sTitle,
                                                      sError );

Modified: openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java (original)
+++ openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/MainThreadDialogExecutor.java Fri Feb  1 08:46:00 2013
@@ -162,8 +162,8 @@ public class MainThreadDialogExecutor im
         else if ( m_xMessageBox != null )
         {
             int nRes = m_xMessageBox.execute();
-            m_bResult = ( nRes == com.sun.star.awt.MessageBoxCommand.OK 
-                          || nRes == com.sun.star.awt.MessageBoxCommand.YES );
+            m_bResult = ( nRes == com.sun.star.awt.MessageBoxResults.OK 
+                          || nRes == com.sun.star.awt.MessageBoxResults.YES );
         }
         
         m_bCalled = true;

Modified: openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java (original)
+++ openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/WikiDialog.java Fri Feb  1 08:46:00 2013
@@ -29,7 +29,7 @@ import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XDialog;
 import com.sun.star.awt.XDialogEventHandler;
 import com.sun.star.awt.XDialogProvider2;
-import com.sun.star.awt.XThrobber;
+import com.sun.star.awt.XAnimation;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.lang.XMultiComponentFactory;
 import com.sun.star.uno.UnoRuntime;
@@ -210,7 +210,7 @@ public class WikiDialog implements XDial
             XMultiServiceFactory xDialogFactory = ( XMultiServiceFactory ) UnoRuntime.queryInterface( XMultiServiceFactory.class, xDialogModel );
             if ( xDialogFactory != null )
             {
-                XControlModel xThrobberModel = (XControlModel)UnoRuntime.queryInterface( XControlModel.class, xDialogFactory.createInstance( "com.sun.star.awt.UnoThrobberControlModel" ) );
+                XControlModel xThrobberModel = (XControlModel)UnoRuntime.queryInterface( XControlModel.class, xDialogFactory.createInstance( "com.sun.star.awt.SpinningProgressControlModel" ) );
                 XPropertySet xThrobberProps = (XPropertySet)UnoRuntime.queryInterface( XPropertySet.class, xThrobberModel );
                 if ( xThrobberProps != null )
                 {
@@ -239,13 +239,13 @@ public class WikiDialog implements XDial
         {
             try
             {
-                XThrobber xThrobber = (XThrobber)UnoRuntime.queryInterface( XThrobber.class, m_xControlContainer.getControl( "WikiThrobber" ) );
+                XAnimation xThrobber = (XAnimation)UnoRuntime.queryInterface( XAnimation.class, m_xControlContainer.getControl( "WikiThrobber" ) );
                 if ( xThrobber != null )
                 {
                     if ( bActive )
-                        xThrobber.start();
+                        xThrobber.startAnimation();
                     else
-                        xThrobber.stop();
+                        xThrobber.stopAnimation();
                 }
             }
             catch( Exception e )
@@ -260,7 +260,7 @@ public class WikiDialog implements XDial
         if ( m_xControlContainer != null )
         {
             try
-            {        
+            {
                 XWindow xWindow = (XWindow)UnoRuntime.queryInterface( XWindow.class, m_xControlContainer.getControl( "WikiThrobber" ) );
                 if ( xWindow != null )
                     xWindow.setVisible( bVisible );
@@ -269,7 +269,7 @@ public class WikiDialog implements XDial
             {
                 e.printStackTrace();
             }
-        }       
+        }
     }
 
     public void SetFocusTo( String aControl )

Modified: openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java (original)
+++ openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/WikiEditSettingDialog.java Fri Feb  1 08:46:00 2013
@@ -25,7 +25,6 @@ package com.sun.star.wiki;
 
 import com.sun.star.awt.XDialog;
 import com.sun.star.awt.XWindowPeer;
-import com.sun.star.awt.XThrobber;
 import com.sun.star.beans.XPropertySet;
 import com.sun.star.uno.UnoRuntime;
 import com.sun.star.uno.XComponentContext;

Modified: openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java (original)
+++ openoffice/branches/ia2/main/swext/mediawiki/src/com/sun/star/wiki/WikiPropDialog.java Fri Feb  1 08:46:00 2013
@@ -26,7 +26,6 @@ package com.sun.star.wiki;
 import com.sun.star.awt.XControl;
 import com.sun.star.awt.XControlModel;
 import com.sun.star.awt.XDialog;
-import com.sun.star.awt.XThrobber;
 import com.sun.star.awt.XWindowPeer;
 import com.sun.star.beans.UnknownPropertyException;
 import com.sun.star.beans.XPropertySet;

Modified: openoffice/branches/ia2/main/swext/mediawiki/src/description.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/swext/mediawiki/src/description.xml?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/swext/mediawiki/src/description.xml (original)
+++ openoffice/branches/ia2/main/swext/mediawiki/src/description.xml Fri Feb  1 08:46:00 2013
@@ -20,14 +20,14 @@
  * 
  ***********************************************************-->
 <description xmlns="http://openoffice.org/extensions/description/2006" xmlns:d="http://openoffice.org/extensions/description/2006" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <version value="1.2.0"/>
+    <version value="1.2.1"/>
     <identifier value="@WIKIEXTENSIONID@"/>
     <display-name>
         <name lang="en-US">@WIKIEXTENSIONPRODUCTNAME@</name>
     </display-name>
     <registration>
         <simple-license accept-by="admin" default-license-id="lic-en-US">
-            <license-text xlink:href="license/LICENSE" lang="isocode" license-id="lic-isocode"/>
+            <license-text xlink:href="license/LICENSE" lang="en-US" license-id="lic-en-US"/>
         </simple-license>
     </registration>
     <dependencies>

Modified: openoffice/branches/ia2/main/sysui/desktop/debian/control
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/debian/control?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/debian/control (original)
+++ openoffice/branches/ia2/main/sysui/desktop/debian/control Fri Feb  1 08:46:00 2013
@@ -1,6 +1,6 @@
 Description: %productname desktop integration
 Maintainer: Apache Software Foundation
 Architecture: all
-Provides: openoffice.org-desktop-integration, openoffice.org-unbundled
-Conflicts: openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
-Replaces: openofficeorg-desktop-integration, openofficeorg-debian-menus
+Provides: apache_openoffice-desktop-integration, openoffice.org-unbundled
+Conflicts: apache_openoffice-desktop-integration, openofficeorg-desktop-integration, openofficeorg-debian-menus, openoffice.org-bundled
+Replaces: apache_openoffice-desktop-integration, openofficeorg-debian-menus

Modified: openoffice/branches/ia2/main/sysui/desktop/debian/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/debian/makefile.mk?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/debian/makefile.mk (original)
+++ openoffice/branches/ia2/main/sysui/desktop/debian/makefile.mk Fri Feb  1 08:46:00 2013
@@ -41,7 +41,7 @@ TARGET=debian
 
 .IF "$(PKGFORMAT)"!="$(PKGFORMAT:s/deb//)"
 
-DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i3.4-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
+DEBFILES=$(foreach,i,{$(PRODUCTLIST)} $(PKGDIR)$/$i3.5-$(TARGET)-menus_$(PKGVERSION.$i)-$(PKGREV)_all.deb)
 
 .ENDIF
 
@@ -56,22 +56,22 @@ ALLTAR : $(DEBFILES) 
 
 %/DEBIAN/control : $$(@:f)
 	@$(MKDIRHIER) $(@:d) $*$/etc $*$/usr/share/applnk/Office $*$/usr/lib/menu
-	ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//)) $*$/etc$/
-	/bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/3.4//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
-        @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.4//)) $(PRODUCTVERSION.$(*:f:s/-/ /:1:s/3.4//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/3.4//))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1:s/3.4//)
-	echo "Package: $(*:f:s/_/ /:1:s/3.4//)" > $@
-	cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.4//))/" >> $@
-	echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/3.4//))-$(PKGREV)" >> $@
+	ln -sf /opt/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//)) $*$/etc$/
+	/bin/sh -c -x "cd $(COMMONMISC)$/$(*:f:s/-/ /:1:s/3.5//) && DESTDIR=$(shell @cd $*; pwd) ICON_PREFIX=$(ICONPREFIX) KDEMAINDIR=/usr GNOMEDIR=/usr create_tree.sh"
+        @cat openoffice.org-debian-menus | sed -e 's/%PRODUCTNAME/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.5//)) $(PRODUCTVERSION.$(*:f:s/-/ /:1:s/3.5//))/' -e 's/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/' -e 's/%ICONPREFIX/$(ICONPREFIX.$(*:f:s/-/ /:1:s/3.5//))/' > $*$/usr/lib/menu/$(*:f:s/_/ /:1:s/3.5//)
+	echo "Package: $(*:f:s/_/ /:1:s/3.5//)" > $@
+	cat $(@:f) | tr -d "\015" | sed "s/%productname/$(PRODUCTNAME.$(*:f:s/-/ /:1:s/3.5//))/" >> $@
+	echo "Version: $(PKGVERSION.$(*:f:s/-/ /:1:s/3.5//))-$(PKGREV)" >> $@
 	@du -k -s $* | awk -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >> $@
 
 %/DEBIAN/postinst : $$(@:f)
-	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/g" > $@
+	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@
 
 %/DEBIAN/postrm : $$(@:f)
-	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/g" > $@
+	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@
 
 %/DEBIAN/prerm : $$(@:f)
-	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.4//))/g" > $@
+	 @cat $< | tr -d "\015" | sed -e "s/%PREFIX/$(UNIXFILENAME.$(*:f:s/-/ /:1:s/3.5//))/g" > $@
 
 # --- packaging ---------------------------------------------------
 
@@ -81,7 +81,7 @@ $(DEBFILES) : makefile.mk control postin
 	-$(RM) $(@:d)$(@:f:s/_/ /:1)_*
 	$(RM) -r $(MISC)$/$(@:b)
 	dmake $(MISC)$/$(@:b)$/DEBIAN$/{control postinst postrm prerm} 
-	@chmod -R g-w $(MISC)$/$(@:b)
+	@chmod -R o-w $(MISC)$/$(@:b)
 	@chmod a+rx $(MISC)$/$(@:b)$/DEBIAN $(MISC)/$(@:b)/DEBIAN/post* $(MISC)/$(@:b)/DEBIAN/pre*
 	@chmod g-s $(MISC)/$(@:b)/DEBIAN
 	@mkdir -p $(PKGDIR)

Modified: openoffice/branches/ia2/main/sysui/desktop/freedesktop/freedesktop-menus.spec
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/freedesktop/freedesktop-menus.spec?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/freedesktop/freedesktop-menus.spec (original)
+++ openoffice/branches/ia2/main/sysui/desktop/freedesktop/freedesktop-menus.spec Fri Feb  1 08:46:00 2013
@@ -27,7 +27,7 @@ Name: %pkgprefix-freedesktop-menus
 #BuildRequires: perl
 Group: Office
 License: ALv2
-Provides: openoffice.org3-desktop-integration
+Provides: apache_openoffice3-desktop-integration
 Conflicts: %pkgprefix-suse-menus
 Conflicts: %pkgprefix-debian-menus
 Conflicts: %pkgprefix-redhat-menus

Modified: openoffice/branches/ia2/main/sysui/desktop/macosx/Info.plist
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/macosx/Info.plist?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/macosx/Info.plist (original)
+++ openoffice/branches/ia2/main/sysui/desktop/macosx/Info.plist Fri Feb  1 08:46:00 2013
@@ -32,7 +32,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.text</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -80,7 +80,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.spreadsheet</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -128,7 +128,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.presentation</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -178,7 +178,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.graphics</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -226,7 +226,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.text-master</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Master</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Master</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -272,7 +272,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.formula</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Formula</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Formula</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -320,7 +320,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.text-template</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text Template</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -366,7 +366,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.spreadsheet-template</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet Template</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -412,7 +412,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.presentation-template</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation Template</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -458,7 +458,7 @@
 			<key>UTTypeIdentifier</key>
 			<string>org.openoffice.graphics-template</string>
 			<key>UTTypeDescription</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing Template</string>
 			<key>UTTypeConformsTo</key>
 			<array>
 				<string>public.data</string>
@@ -868,7 +868,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>text.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -906,7 +906,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>spreadsheet.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -946,7 +946,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>presentation.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -984,7 +984,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>drawing.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1020,7 +1020,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>master-document.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Master</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Master</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1058,7 +1058,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>formula.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Formula</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Formula</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1094,7 +1094,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>text-template.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Text Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Text Template</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1130,7 +1130,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>spreadsheet-template.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Spreadsheet Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Spreadsheet Template</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1166,7 +1166,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>presentation-template.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Presentation Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Presentation Template</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>
@@ -1202,7 +1202,7 @@
 			<key>CFBundleTypeIconFile</key>
 			<string>drawing-template.icns</string>
 			<key>CFBundleTypeName</key>
-			<string>${FILEFORMATNAME} ${FILEFORMATVERSION} Drawing Template</string>
+			<string>${OOOXMLFILEFORMATNAME} ${OOOXMLFILEFORMATVERSION} Drawing Template</string>
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>LSIsAppleDefaultForType</key>

Modified: openoffice/branches/ia2/main/sysui/desktop/macosx/gen_strings.pl
URL: http://svn.apache.org/viewvc/openoffice/branches/ia2/main/sysui/desktop/macosx/gen_strings.pl?rev=1441343&r1=1441342&r2=1441343&view=diff
==============================================================================
--- openoffice/branches/ia2/main/sysui/desktop/macosx/gen_strings.pl (original)
+++ openoffice/branches/ia2/main/sysui/desktop/macosx/gen_strings.pl Fri Feb  1 08:46:00 2013
@@ -99,7 +99,6 @@ sub print_lang
       if ( $lang ne $_ && $lang eq $this_lang && exists $documents{$last_section} ) {
         # replacing product variable doesn't work inside zip files and also not for UTF-16
         next if /%PRODUCTNAME/;
-#        s/%PRODUCTNAME/\${FILEFORMATNAME} \${FILEFORMATVERSION}/g;
         s/$lang/"$documents{$last_section}"/;
         s/\n/;\n/;
         print;



Mime
View raw message