cleanup cut/paste .src changes and add 'Embed' check-box to src

4 files changed, 85 insertions, 181 deletions

diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 5296dd5c01b9..08a1068f471d 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -471,7 +471,7 @@ void AbstractSearchProgress_Impl::Update()
 
 void AbstractSearchProgress_Impl::Sync()
 {
-     pDlg-> Sync();
+     pDlg->Sync();
 }
 
 void AbstractSearchProgress_Impl::SetFileType( const String& rType )
@@ -495,7 +495,7 @@ void AbstractTakeProgress_Impl::Update()
 
 void AbstractTakeProgress_Impl::Sync()
 {
-     pDlg-> Sync();
+     pDlg->Sync();
 }
 
 void AbstractTakeProgress_Impl::SetFile( const INetURLObject& rURL )
@@ -525,7 +525,7 @@ void VclAbstractRefreshableDialog_Impl::Update()
 
 void VclAbstractRefreshableDialog_Impl::Sync()
 {
-     pDlg-> Sync();
+     pDlg->Sync();
 }
 
 String AbstractURLDlg_Impl::GetURL() const
@@ -615,12 +615,12 @@ sal_uInt16 AbstractSvxSearchSimilarityDialog_Impl::GetShorter()
 
 sal_uInt16 AbstractSvxSearchSimilarityDialog_Impl::GetLonger()
 {
-    return pDlg-> GetLonger();
+    return pDlg->GetLonger();
 }
 
 sal_Bool AbstractSvxSearchSimilarityDialog_Impl::IsRelaxed()
 {
-    return pDlg-> IsRelaxed();
+    return pDlg->IsRelaxed();
 }
 
 // AbstractSvxTransformTabDialog implementations just forwards everything to the dialog
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 897916b6b829..cafdc48bebff 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -32,11 +32,7 @@
 
 #include <svx/tabarea.hxx>
 
-/*************************************************************************
-|*
-|* Fl"achen-Tab-Dialog
-|*
-\************************************************************************/
+/************************************************************************/
 
 class SvxAreaTabDialog : public SfxTabDialog
 {
@@ -105,11 +101,7 @@ public:
     void                 DontDeleteColorTable() { mbDeleteColorTable = sal_False; }
 };
 
-/*************************************************************************
-|*
-|* Transparence-Tab-Page
-|*
-\************************************************************************/
+/************************************************************************/
 
 class SvxTransparenceTabPage : public SvxTabPage
 {
@@ -190,11 +182,7 @@ public:
     virtual void PageCreated (SfxAllItemSet aSet);
 };
 
-/*************************************************************************
-|*
-|* Fl"achen-Tab-Page
-|*
-\************************************************************************/
+/************************************************************************/
 
 class SvxAreaTabPage : public SvxTabPage
 {
@@ -316,11 +304,6 @@ public:
     void    SetBmpChgd( ChangeType* pIn ) { pnBitmapListState = pIn; }
 };
 
-/*************************************************************************
-|*
-|* Schatten-Tab-Page
-|*
-\************************************************************************/
 
 class SvxShadowTabPage : public SvxTabPage
 {
@@ -384,11 +367,7 @@ public:
     void    DisablePage( sal_Bool bIn ) { bDisable = bIn; }
 };
 
-/*************************************************************************
-|*
-|* Farbverlauf-Tab-Page
-|*
-\************************************************************************/
+/************************************************************************/
 
 class SvxGradientTabPage : public SfxTabPage
 {
@@ -477,11 +456,7 @@ public:
     void    SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
 };
 
-/*************************************************************************
-|*
-|* Schraffuren-Tab-Page
-|*
-\************************************************************************/
+/************************************************************************/
 
 class SvxHatchTabPage : public SvxTabPage
 {
@@ -569,11 +544,7 @@ public:
     virtual void        DataChanged( const DataChangedEvent& rDCEvt );
 };
 
-/*************************************************************************
-|*
-|* Bitmap-Tab-Page
-|*
-\************************************************************************/
+/************************************************************************/
 
 class SvxBitmapTabPage : public SvxTabPage
 {
@@ -670,11 +641,7 @@ public:
     virtual Window* GetParentLabeledBy( const Window* pLabeled ) const;
 };
 
-/*************************************************************************
-|*
-|* Farben-Tab-Page
-|*
-\************************************************************************/
+/************************************************************************/
 
 class SvxColorTabPage : public SfxTabPage
 {
diff --git a/cui/source/tabpages/tabarea.hrc b/cui/source/tabpages/tabarea.hrc
index 8e2f9b4344c2..01eb1117ae5a 100644
--- a/cui/source/tabpages/tabarea.hrc
+++ b/cui/source/tabpages/tabarea.hrc
@@ -26,6 +26,7 @@
  ************************************************************************/
 #define BTN_LOAD 5
 #define BTN_SAVE 6
+#define BTN_EMBED 7
 #define GRP_FILL 1
 #define GRP_SHADOW 2
 #define GRP_PREVIEW 3
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index 4fd3db7c8996..a3e1e5417e1a 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -32,7 +32,6 @@
 
 #define MASKCOLOR       MaskColor = Color{ Red = 0xff00 ; Green = 0x0000 ; Blue = 0xff00 ; };
 
-
  // RID_SVXPAGE_AREA ------------------------------------------------------
 #define TRANS_GRAD_OFFSET_X             6
 #define TRANS_GRAD_OFFSET_Y             64
@@ -256,7 +255,7 @@ TabPage RID_SVXPAGE_TRANSPARENCE
     Text [ en-US ] = "Transparency";
 };
 
- // RID_SVXPAGE_AREA ------------------------------------------------------
+// ------------------------------------------------------
 TabPage RID_SVXPAGE_AREA
 {
     Size = MAP_APPFONT ( 260 , 185 ) ;
@@ -576,7 +575,8 @@ TabPage RID_SVXPAGE_AREA
         SpinSize = 5 ;
     };
 };
- // RID_SVXPAGE_SHADOW ------------------------------------------------------
+
+// ------------------------------------------------------
 TabPage RID_SVXPAGE_SHADOW
 {
     HelpID = HID_AREA_SHADOW ;
@@ -681,7 +681,53 @@ TabPage RID_SVXPAGE_SHADOW
         TabStop = FALSE ;
     };
 };
- // RID_SVXPAGE_HATCH --------------------------------------------------------
+
+// Helper for creating the load / save / embed buttons in std. positions
+
+#define LOAD_BUTTON(hid,qhtxt) \
+    ImageButton BTN_LOAD \
+    { \
+	HelpID = hid ; \
+        Pos = MAP_APPFONT ( 197 , 104  ) ; \
+        Size = MAP_APPFONT ( 16 , 16 ) ; \
+        TabStop = TRUE ; \
+        QuickHelpText [ en-US ] = qhtxt ; \
+        ButtonImage = Image \
+        { \
+            ImageBitmap = Bitmap \
+            { \
+                File = "sc05501.bmp" ; \
+            }; \
+        }; \
+    } \
+
+#define SAVE_BUTTON(hid,qhtxt) \
+    ImageButton BTN_SAVE \
+    { \
+	HelpID = hid ;			   \
+        Pos = MAP_APPFONT ( 217 , 104  ) ; \
+        Size = MAP_APPFONT ( 16 , 16 ) ; \
+        TabStop = TRUE ; \
+        QuickHelpText [ en-US ] = qhtxt ; \
+        ButtonImage = Image \
+        { \
+            ImageBitmap = Bitmap \
+            { \
+                File = "sc05502.bmp" ; \
+            }; \
+        }; \
+    }
+
+#define EMBED_BUTTON(hid,txt) \
+    CheckBox BTN_EMBED \
+    { \
+	HelpID = hid ; \
+        Pos = MAP_APPFONT ( 197 , 124 ) ; \
+        Size = MAP_APPFONT ( 122 , 10 ) ; \
+        Text [ en-US ] = txt ; \
+    }
+
+// ------------------------------------------------------
 TabPage RID_SVXPAGE_HATCH
 {
     HelpID = HID_AREA_HATCH ;
@@ -821,40 +867,13 @@ TabPage RID_SVXPAGE_HATCH
         Text [ en-US ] = "~Delete..." ;
         TabStop = TRUE ;
     };
-    ImageButton BTN_LOAD
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD";
-        Pos = MAP_APPFONT ( 197 , 104  ) ;
-        Size = MAP_APPFONT ( 16 , 16 ) ;
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Load Hatches List" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "sc05501.bmp" ;
-            };
-            MASKCOLOR
-        };
-    };
-    ImageButton BTN_SAVE
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE";
-        Pos = MAP_APPFONT ( 197 , 124 ) ;
-        Size = MAP_APPFONT ( 16 , 16 ) ;
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Save Hatches List" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "sc05502.bmp" ;
-            };
-            MASKCOLOR
-        };
-    };
+
+    LOAD_BUTTON( "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD", "Load Hatches List" );
+    SAVE_BUTTON( "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE", "Save Hatches List" );
+    EMBED_BUTTON( "cui:ImageButton:RID_SVXPAGE_HATCH:BTN_EMBED", "Embed" );
 };
- // RID_SVXPAGE_BITMAP -------------------------------------------------------
+
+// ------------------------------------------------------
 TabPage RID_SVXPAGE_BITMAP
 {
     HelpID = HID_AREA_BITMAP ;
@@ -963,40 +982,13 @@ TabPage RID_SVXPAGE_BITMAP
         Text [ en-US ] = "~Delete..." ;
         TabStop = TRUE ;
     };
-    ImageButton BTN_LOAD
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD";
-        Pos = MAP_APPFONT ( 197 , 104  ) ;
-        Size = MAP_APPFONT ( 16 , 16 ) ;
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Load Bitmap List" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "sc05501.bmp" ;
-            };
-            MASKCOLOR
-        };
-    };
-    ImageButton BTN_SAVE
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE";
-        Pos = MAP_APPFONT ( 197 , 124  ) ;
-        Size = MAP_APPFONT ( 16 , 16 ) ;
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Save Bitmap List" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "sc05502.bmp" ;
-            };
-            MASKCOLOR
-        };
-    };
+
+    LOAD_BUTTON( "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD", "Load Bitmap List" );
+    SAVE_BUTTON( "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE", "Save Bitmap List" );
+    EMBED_BUTTON( "cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_EMBED", "Embed" );
 };
- // RID_SVXPAGE_GRADIENT -----------------------------------------------------
+
+// ------------------------------------------------------
 TabPage RID_SVXPAGE_GRADIENT
 {
     HelpID = HID_AREA_GRADIENT ;
@@ -1222,40 +1214,12 @@ TabPage RID_SVXPAGE_GRADIENT
         Text [ en-US ] = "~Delete..." ;
         TabStop = TRUE ;
     };
-    ImageButton BTN_LOAD
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD";
-        Pos = MAP_APPFONT ( 197 , 104  ) ;
-        Size = MAP_APPFONT ( 16 , 16 ) ;
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Load Gradients List" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "sc05501.bmp" ;
-            };
-            MASKCOLOR
-        };
-    };
-    ImageButton BTN_SAVE
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE";
-        Pos = MAP_APPFONT ( 197 , 124  ) ;
-        Size = MAP_APPFONT ( 16 , 16 ) ;
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Save Gradients List" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "sc05502.bmp" ;
-            };
-            MASKCOLOR
-        };
-    };
+    LOAD_BUTTON( "cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD", "Load Gradients List" );
+    SAVE_BUTTON( "cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE", "Save Gradients List" );
+    EMBED_BUTTON( "cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_EMBED", "Embed" );
 };
- // RID_SVXPAGE_COLOR --------------------------------------------------------
+
+// ------------------------------------------------------
 TabPage RID_SVXPAGE_COLOR
 {
     HelpId = HID_OPTIONS_COLOR ;
@@ -1453,40 +1417,12 @@ TabPage RID_SVXPAGE_COLOR
         Text [ en-US ] = "~Modify" ;
         TabStop = TRUE ;
     };
-    ImageButton BTN_LOAD
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD";
-        Pos = MAP_APPFONT ( 197 , 104  ) ;
-        Size = MAP_APPFONT ( 16 , 16 ) ;
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Load Color List" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "sc05501.bmp" ;
-            };
-            MASKCOLOR
-        };
-    };
-    ImageButton BTN_SAVE
-    {
-        HelpID = "cui:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE";
-        Pos = MAP_APPFONT ( 197 , 124  ) ;
-        Size = MAP_APPFONT ( 16 , 16 ) ;
-        TabStop = TRUE ;
-        QuickHelpText [ en-US ] = "Save Color List" ;
-        ButtonImage = Image
-        {
-            ImageBitmap = Bitmap
-            {
-                File = "sc05502.bmp" ;
-            };
-            MASKCOLOR
-        };
-    };
+    LOAD_BUTTON( "cui:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD", "Load Color List" );
+    SAVE_BUTTON( "cui:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE", "Save Color List" );
+    EMBED_BUTTON( "cui:ImageButton:RID_SVXPAGE_COLOR:BTN_EMBED", "Embed" );
 };
- // RID_SVXDLG_AREA ----------------------------------------------------------
+
+// ------------------------------------------------------
 TabDialog RID_SVXDLG_AREA
 {
     OutputSize = TRUE ;