gnumake3: mergeing changes from DEV300_m97, fixing jars for svl complex test, deliver globlmn.hrc for now, adding component registration for svx libraries, still misses gengal and friends when packing

27 files changed, 67 insertions, 52 deletions

diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 6d88e0601bcc..501cf488f556 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,svx))
 
+$(eval $(call gb_Library_set_componentfile,svx,svx/util/svx))
+
 $(eval $(call gb_Library_set_include,svx,\
     $$(SOLARINC) \
     -I$(SRCDIR)/svx/inc \
diff --git a/svx/Library_svxcore.mk b/svx/Library_svxcore.mk
index e14f3b34d826..3acc48d80ec6 100644
--- a/svx/Library_svxcore.mk
+++ b/svx/Library_svxcore.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,svxcore))
 
+$(eval $(call gb_Library_set_componentfile,svx,svx/util/svxcore))
+
 $(eval $(call gb_Library_add_sdi_headers,svx,svx/sdi/svxslots))
 
 $(eval $(call gb_Library_add_package_headers,svxcore,\
diff --git a/svx/Library_textconversiondlgs.mk b/svx/Library_textconversiondlgs.mk
index bcdfdfc7f9b5..98f5612dde77 100644
--- a/svx/Library_textconversiondlgs.mk
+++ b/svx/Library_textconversiondlgs.mk
@@ -27,6 +27,8 @@
 
 $(eval $(call gb_Library_Library,textconversiondlgs))
 
+$(eval $(call gb_Library_set_componentfile,textconversiondlgs,svx/util/textconversiondlgs))
+
 $(eval $(call gb_Library_set_include,textconversiondlgs,\
     -I$(SRCDIR)/svx/inc \
     -I$(SRCDIR)/svx/inc/pch \
diff --git a/svx/Package_inc.mk b/svx/Package_inc.mk
index 4f19f856ab70..481d8838c9fe 100644
--- a/svx/Package_inc.mk
+++ b/svx/Package_inc.mk
@@ -556,4 +556,5 @@ $(eval $(call gb_Package_add_file,svx_inc,inc/svx/svxdllapi.h,svx/svxdllapi.h))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/colrctrl.hxx,svx/colrctrl.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/fmdpage.hxx,svx/fmdpage.hxx))
 $(eval $(call gb_Package_add_file,svx_inc,inc/svx/sxmtpitm.hxx,svx/sxmtpitm.hxx))
+$(eval $(call gb_Package_add_file,svx_inc,inc/svx/globlmn.hrc,globlmn_tmpl.hrc))
 
diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx
index 59d156f82018..f6c1a594fdd5 100644
--- a/svx/inc/pch/precompiled_svx.hxx
+++ b/svx/inc/pch/precompiled_svx.hxx
@@ -919,7 +919,7 @@
 #include "vcl/cursor.hxx"
 #include "vcl/decoview.hxx"
 #include "vcl/dndhelp.hxx"
-#include "vcl/fldunit.hxx"
+#include "tools/fldunit.hxx"
 #include "vcl/fntstyle.hxx"
 #include "unotools/fontcvt.hxx"
 #include "vcl/gdimtf.hxx"
@@ -938,7 +938,7 @@
 #include "vcl/unohelp.hxx"
 #include "vcl/unohelp2.hxx"
 #include "vcl/wall.hxx"
-#include "vcl/wintypes.hxx"
+#include "tools/wintypes.hxx"
 #include "vos/mutex.hxx"
 #include "vos/ref.hxx"
 #include "vos/refernce.hxx"
diff --git a/svx/inc/svx/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx
index 886db3280d60..df21245bc99b 100644
--- a/svx/inc/svx/fmgridif.hxx
+++ b/svx/inc/svx/fmgridif.hxx
@@ -49,7 +49,7 @@
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <toolkit/controls/unocontrol.hxx>
 #include <toolkit/awt/vclxwindow.hxx>
 #include <comphelper/uno3.hxx>
diff --git a/svx/inc/svx/fmtools.hxx b/svx/inc/svx/fmtools.hxx
index b39f46e85d14..f98919fe47d8 100644
--- a/svx/inc/svx/fmtools.hxx
+++ b/svx/inc/svx/fmtools.hxx
@@ -71,7 +71,7 @@
 #include <com/sun/star/util/XNumberFormatter.hpp>
 #include <com/sun/star/util/XNumberFormats.hpp>
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <comphelper/uno3.hxx>
 #include <comphelper/stl_types.hxx>
diff --git a/svx/inc/svx/xdef.hxx b/svx/inc/svx/xdef.hxx
index 963e4935c617..dd0fbd802291 100644
--- a/svx/inc/svx/xdef.hxx
+++ b/svx/inc/svx/xdef.hxx
@@ -36,7 +36,8 @@
 |*
 \************************************************************************/
 
-#define COL_DEFAULT_SHAPE_FILLING   RGB_COLORDATA( 153, 204, 255 )  // blue 8
+#define COL_DEFAULT_SHAPE_FILLING   RGB_COLORDATA( 0xCF, 0xE7, 0xE5 )
+#define COL_DEFAULT_SHAPE_STROKE    RGB_COLORDATA( 128, 128, 128 )
 
 #define XATTR_START             1000
 
diff --git a/svx/prj/makefile.mk b/svx/prj/makefile.mk
deleted file mode 100644
index 2a0b99e72fd5..000000000000
--- a/svx/prj/makefile.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-all:
-    cd .. && make -srj9
diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src
index a9cd2fe60b2f..7823007dbe7c 100644
--- a/svx/source/dialog/bmpmask.src
+++ b/svx/source/dialog/bmpmask.src
@@ -289,7 +289,7 @@ DockingWindow RID_SVXDLG_BMPMASK
                     ImageBitmap = Bitmap { File = "sc10350.bmp" ; };
                     MASKCOLOR
                 };
-                Text [ en-US ] = "Eyedropper" ;
+                Text [ en-US ] = "Pipette" ;
             };
         };
     };
@@ -300,7 +300,7 @@ DockingWindow RID_SVXDLG_BMPMASK
         Pos = MAP_APPFONT ( 22 , 6 ) ;
         Size = MAP_APPFONT ( 43 , 14 ) ;
     };
-    Text [ en-US ] = "Eyedropper" ;
+    Text [ en-US ] = "Color Replacer" ;
 
     Image IMG_PIPETTE
     {
diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src
index bf587b3b1fda..989bdd93d336 100644
--- a/svx/source/dialog/contdlg.src
+++ b/svx/source/dialog/contdlg.src
@@ -170,7 +170,7 @@ FloatingWindow RID_SVXDLG_CONTOUR
             {
                 Identifier = TBI_PIPETTE ;
                 HelpId = HID_CONTDLG_PIPETTE ;
-                Text [ en-US ] = "Eyedropper" ;
+                Text [ en-US ] = "Pipette" ;
                 AutoCheck = TRUE ;
             };
         };
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index f281580b93db..8a5bfa75f7fa 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -276,8 +276,8 @@ BOOL SvxGridTabPage::FillItemSet( SfxItemSet& rCoreSet )
 
         aGridItem.nFldDrawX    = (UINT32) nX;
         aGridItem.nFldDrawY    = (UINT32) nY;
-        aGridItem.nFldDivisionX = static_cast<long>(aNumFldDivisionX.GetValue());
-        aGridItem.nFldDivisionY = static_cast<long>(aNumFldDivisionY.GetValue());
+        aGridItem.nFldDivisionX = static_cast<long>(aNumFldDivisionX.GetValue()-1);
+        aGridItem.nFldDivisionY = static_cast<long>(aNumFldDivisionY.GetValue()-1);
 
         rCoreSet.Put( aGridItem );
     }
@@ -303,12 +303,8 @@ void SvxGridTabPage::Reset( const SfxItemSet& rSet )
         SetMetricValue( aMtrFldDrawX , pGridAttr->nFldDrawX, eUnit );
         SetMetricValue( aMtrFldDrawY , pGridAttr->nFldDrawY, eUnit );
 
-//      UINT32 nFineX = pGridAttr->nFldDivisionX;
-//      UINT32 nFineY = pGridAttr->nFldDivisionY;
-//      aNumFldDivisionX.SetValue( nFineX ? (pGridAttr->nFldDrawX / nFineX - 1) : 0 );
-//      aNumFldDivisionY.SetValue( nFineY ? (pGridAttr->nFldDrawY / nFineY - 1) : 0 );
-        aNumFldDivisionX.SetValue( pGridAttr->nFldDivisionX );
-        aNumFldDivisionY.SetValue( pGridAttr->nFldDivisionY );
+        aNumFldDivisionX.SetValue( pGridAttr->nFldDivisionX+1 );
+        aNumFldDivisionY.SetValue( pGridAttr->nFldDivisionY+1 );
     }
 
     ChangeGridsnapHdl_Impl( &aCbxUseGridsnap );
diff --git a/svx/source/dialog/optgrid.src b/svx/source/dialog/optgrid.src
index 2bc7b430f807..0d65c63f5d2f 100644
--- a/svx/source/dialog/optgrid.src
+++ b/svx/source/dialog/optgrid.src
@@ -140,6 +140,7 @@ TabPage RID_SVXPAGE_GRID
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
+        Minimum = 1 ;
         Maximum = 99 ;
         Last = 99 ;
         StrictFormat = TRUE ;
@@ -149,7 +150,7 @@ TabPage RID_SVXPAGE_GRID
     {
         Pos = MAP_APPFONT ( 223 , 56 ) ;
         Size = MAP_APPFONT ( 29 , 8 ) ;
-        Text [ en-US ] = "point(s)" ;
+        Text [ en-US ] = "space(s)" ;
     };
     NumericField NUM_FLD_DIVISION_Y
     {
@@ -160,6 +161,7 @@ TabPage RID_SVXPAGE_GRID
         TabStop = TRUE ;
         Repeat = TRUE ;
         Spin = TRUE ;
+        Minimum = 1 ;
         Maximum = 99 ;
         Last = 99 ;
         StrictFormat = TRUE ;
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index 7fb9d8330cf6..7cdf707eb811 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -1653,11 +1653,14 @@ DbCheckBox::DbCheckBox( DbGridColumn& _rColumn )
 
 namespace
 {
-    void setCheckBoxStyle( Window* _pWindow, USHORT nStyle )
+    void setCheckBoxStyle( Window* _pWindow, bool bMono )
     {
         AllSettings aSettings = _pWindow->GetSettings();
         StyleSettings aStyleSettings = aSettings.GetStyleSettings();
-        aStyleSettings.SetCheckBoxStyle( nStyle );
+        if( bMono )
+            aStyleSettings.SetOptions( aStyleSettings.GetOptions() | STYLE_OPTION_MONO );
+        else
+            aStyleSettings.SetOptions( aStyleSettings.GetOptions() & (~STYLE_OPTION_MONO) );
         aSettings.SetStyleSettings( aStyleSettings );
         _pWindow->SetSettings( aSettings );
     }
@@ -1683,8 +1686,8 @@ void DbCheckBox::Init( Window& rParent, const Reference< XRowSet >& xCursor )
         sal_Int16 nStyle = awt::VisualEffect::LOOK3D;
         OSL_VERIFY( xModel->getPropertyValue( FM_PROP_VISUALEFFECT ) >>= nStyle );
 
-        setCheckBoxStyle( m_pWindow, nStyle == awt::VisualEffect::FLAT ? STYLE_CHECKBOX_MONO : STYLE_CHECKBOX_WIN );
-        setCheckBoxStyle( m_pPainter, nStyle == awt::VisualEffect::FLAT ? STYLE_CHECKBOX_MONO : STYLE_CHECKBOX_WIN );
+        setCheckBoxStyle( m_pWindow, nStyle == awt::VisualEffect::FLAT );
+        setCheckBoxStyle( m_pPainter, nStyle == awt::VisualEffect::FLAT );
 
         sal_Bool bTristate = sal_True;
         OSL_VERIFY( xModel->getPropertyValue( FM_PROP_TRISTATE ) >>= bTristate );
diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx
index 32ad01aca4a2..9198f02278bb 100644
--- a/svx/source/gallery2/gallery1.cxx
+++ b/svx/source/gallery2/gallery1.cxx
@@ -626,7 +626,7 @@ BOOL Gallery::CreateTheme( const String& rThemeName, UINT32 nNumFrom )
 
     if( !HasTheme( rThemeName ) && ( GetUserURL().GetProtocol() != INET_PROT_NOT_VALID ) )
     {
-        nLastFileNumber=nNumFrom > nLastFileNumber ? nNumFrom : ++nLastFileNumber;
+        nLastFileNumber = nNumFrom > nLastFileNumber ? nNumFrom : nLastFileNumber + 1;
         GalleryThemeEntry* pNewEntry = new GalleryThemeEntry( GetUserURL(), rThemeName,
                                                               nLastFileNumber,
                                                               FALSE, FALSE, TRUE, 0, FALSE );
diff --git a/svx/source/items/customshapeitem.cxx b/svx/source/items/customshapeitem.cxx
index c7a401ed4054..08eebe99b3df 100644
--- a/svx/source/items/customshapeitem.cxx
+++ b/svx/source/items/customshapeitem.cxx
@@ -60,7 +60,7 @@ size_t SdrCustomShapeGeometryItem::PropertyPairHash::operator()( const SdrCustom
     return (size_t)r1.first.hashCode() + r1.second.hashCode();
 };
 
-TYPEINIT1_FACTORY( SdrCustomShapeGeometryItem, SfxPoolItem , new  SdrCustomShapeGeometryItem(0));
+TYPEINIT1_FACTORY( SdrCustomShapeGeometryItem, SfxPoolItem , new  SdrCustomShapeGeometryItem);
 SdrCustomShapeGeometryItem::SdrCustomShapeGeometryItem()
 :   SfxPoolItem( SDRATTR_CUSTOMSHAPE_GEOMETRY )
 {}
diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
index e24aa1c29de7..5d4e6d71fbe9 100644
--- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
+++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx
@@ -121,7 +121,7 @@ namespace sdr
                         aViewRange,
                         GetXDrawPageForSdrPage(const_cast< SdrPage* >(mpProcessedPage)),
                         0.0,
-                        0);
+                        com::sun::star::uno::Sequence<com::sun::star::beans::PropertyValue>());
                     updateViewInformation2D(aNewViewInformation2D);
 
                     // collect primitive data in a sequence; this will already use the updated ViewInformation2D
diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx
index d2264e219c48..d804cce575a1 100644
--- a/svx/source/sdr/contact/objectcontactofpageview.cxx
+++ b/svx/source/sdr/contact/objectcontactofpageview.cxx
@@ -241,7 +241,7 @@ namespace sdr
                 aViewRange,
                 GetXDrawPageForSdrPage(GetSdrPage()),
                 fCurrentTime,
-                0);
+                uno::Sequence<beans::PropertyValue>());
             updateViewInformation2D(aNewViewInformation2D);
 
             // get whole Primitive2DSequence; this will already make use of updated ViewInformation2D
diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx
index d4748a14ed98..845f1c813325 100644
--- a/svx/source/sdr/contact/viewcontactofgraphic.cxx
+++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx
@@ -296,7 +296,7 @@ namespace sdr
 
                     // decompose immediately with neutral ViewInformation. This will
                     // layout the text to more simple TextPrimitives from drawinglayer
-                    const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0);
+                    const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
 
                     drawinglayer::primitive2d::appendPrimitive2DSequenceToPrimitive2DSequence(
                         xRetval,
diff --git a/svx/source/sdr/overlay/overlaymanager.cxx b/svx/source/sdr/overlay/overlaymanager.cxx
index f52205d88e45..93e3b03d072d 100644
--- a/svx/source/sdr/overlay/overlaymanager.cxx
+++ b/svx/source/sdr/overlay/overlaymanager.cxx
@@ -138,7 +138,7 @@ namespace sdr
             mnStripeLengthPixel(5),
             maDrawinglayerOpt(),
             maViewTransformation(),
-            maViewInformation2D(0),
+            maViewInformation2D(),
             mfDiscreteOne(0.0)
         {
             // set Property 'ReducedDisplayQuality' to true to allow simpler interaction
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index d41b5b1a1c34..058ba94cf3a6 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -902,6 +902,9 @@ void SdrDragMovHdl::TakeSdrDragComment(XubString& rStr) const
 
 bool SdrDragMovHdl::BeginSdrDrag()
 {
+    if( !GetDragHdl() )
+        return false;
+
     DragStat().Ref1()=GetDragHdl()->GetPos();
     DragStat().SetShown(!DragStat().IsShown());
     SdrHdlKind eKind=GetDragHdl()->GetKind();
@@ -931,7 +934,7 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt)
 {
     Point aPnt(rNoSnapPnt);
 
-    if (DragStat().CheckMinMoved(rNoSnapPnt))
+    if ( GetDragHdl() && DragStat().CheckMinMoved(rNoSnapPnt))
     {
         if (GetDragHdl()->GetKind()==HDL_MIRX)
         {
@@ -1042,22 +1045,25 @@ void SdrDragMovHdl::MoveSdrDrag(const Point& rNoSnapPnt)
 
 bool SdrDragMovHdl::EndSdrDrag(bool /*bCopy*/)
 {
-    switch (GetDragHdl()->GetKind())
+    if( GetDragHdl() )
     {
-        case HDL_REF1:
-            Ref1()=DragStat().GetNow();
-            break;
+        switch (GetDragHdl()->GetKind())
+        {
+            case HDL_REF1:
+                Ref1()=DragStat().GetNow();
+                break;
 
-        case HDL_REF2:
-            Ref2()=DragStat().GetNow();
-            break;
+            case HDL_REF2:
+                Ref2()=DragStat().GetNow();
+                break;
 
-        case HDL_MIRX:
-            Ref1()+=DragStat().GetNow()-DragStat().GetStart();
-            Ref2()+=DragStat().GetNow()-DragStat().GetStart();
-            break;
+            case HDL_MIRX:
+                Ref1()+=DragStat().GetNow()-DragStat().GetStart();
+                Ref2()+=DragStat().GetNow()-DragStat().GetStart();
+                break;
 
-        default: break;
+            default: break;
+        }
     }
 
     return true;
@@ -1066,7 +1072,11 @@ bool SdrDragMovHdl::EndSdrDrag(bool /*bCopy*/)
 void SdrDragMovHdl::CancelSdrDrag()
 {
     Hide();
-    GetDragHdl()->SetPos(DragStat().GetRef1());
+
+    SdrHdl* pHdl = GetDragHdl();
+    if( pHdl )
+        pHdl->SetPos(DragStat().GetRef1());
+
     SdrHdl* pHM = GetHdlList().GetHdl(HDL_MIRX);
 
     if(pHM)
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 0a0c35aec524..18e04f648725 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -940,7 +940,7 @@ void SdrObject::RecalcBoundRect()
         if(xPrimitives.hasElements())
         {
             // use neutral ViewInformation and get the range of the primitives
-            const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0);
+            const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
             const basegfx::B2DRange aRange(drawinglayer::primitive2d::getB2DRangeFromPrimitive2DSequence(xPrimitives, aViewInformation2D));
 
             if(!aRange.isEmpty())
@@ -1202,7 +1202,7 @@ basegfx::B2DPolyPolygon SdrObject::TakeContour() const
         if(xSequence.hasElements())
         {
             // use neutral ViewInformation
-            const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0);
+            const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
 
             // create extractor, process and get result
             drawinglayer::processor2d::ContourExtractor2D aExtractor(aViewInformation2D);
@@ -2431,7 +2431,7 @@ SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, BOOL bForceLineDas
         if(xSequence.hasElements())
         {
             // use neutral ViewInformation
-            const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0);
+            const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
 
             // create extractor, process and get result
             drawinglayer::processor2d::LineGeometryExtractor2D aExtractor(aViewInformation2D);
diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 4559dacb31d8..65514307bb86 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -354,7 +354,7 @@ SdrObject* SdrTextObj::ImpConvertContainedTextToSdrPathObjs(bool bToPoly) const
     if(xSequence.hasElements())
     {
         // create an extractor with neutral ViewInformation
-        const drawinglayer::geometry::ViewInformation2D aViewInformation2D(0);
+        const drawinglayer::geometry::ViewInformation2D aViewInformation2D;
         drawinglayer::processor2d::TextAsPolygonExtractor2D aExtractor(aViewInformation2D);
 
         // extract text as polygons
diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx
index 1320aef9b17b..51ab577ca74c 100644
--- a/svx/source/svdraw/svdview.cxx
+++ b/svx/source/svdraw/svdview.cxx
@@ -988,8 +988,6 @@ Pointer SdrView::GetPreferedPointer(const Point& rMousePos, const OutputDevice*
         if ((IsDraggingPoints() || IsDraggingGluePoints()) && IsMouseHideWhileDraggingPoints())
             return Pointer(POINTER_NULL);
 
-        OSL_TRACE("SdrView::GetPreferedPointer(%lx) %lx\n", this, mpCurrentSdrDragMethod);
-
         return mpCurrentSdrDragMethod->GetSdrDragPointer();
     }
     if (IsMarkObj() || IsMarkPoints() || IsMarkGluePoints() || IsEncirclement() || IsSetPageOrg()) return Pointer(POINTER_ARROW);
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index ffc6c28f9fec..6132139e0164 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -39,7 +39,7 @@
 #include <com/sun/star/media/ZoomLevel.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <vcl/fldunit.hxx>
+#include <tools/fldunit.hxx>
 #include <tools/shl.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx
index 3d377c88fa4d..0435b62cd3c8 100644
--- a/svx/source/xoutdev/xpool.cxx
+++ b/svx/source/xoutdev/xpool.cxx
@@ -52,8 +52,8 @@ XOutdevItemPool::XOutdevItemPool(
     const XubString aNullStr;
     const Bitmap aNullBmp;
     const basegfx::B2DPolyPolygon aNullPol;
-    const Color aNullLineCol(RGB_Color(COL_BLACK));
-    const Color aNullFillCol(RGB_Color(COL_DEFAULT_SHAPE_FILLING));  // "Blue 8"
+    const Color aNullLineCol(RGB_Color(COL_DEFAULT_SHAPE_STROKE));
+    const Color aNullFillCol(RGB_Color(COL_DEFAULT_SHAPE_FILLING));
     const Color aNullShadowCol(RGB_Color(COL_LIGHTGRAY));
     const XDash aNullDash;
     const XGradient aNullGrad(aNullLineCol, RGB_Color(COL_WHITE));
diff --git a/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component b/svx/util/textconversiondlgs.component
index 184743583645..184743583645 100644
--- a/svx/source/unodialogs/textconversiondlgs/textconversiondlgs.component
+++ b/svx/util/textconversiondlgs.component