openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1468897 - in /openoffice/trunk/main/svx: inc/svx/ source/sidebar/line/ source/sidebar/paragraph/ source/sidebar/text/
Date Wed, 17 Apr 2013 13:15:11 GMT
Author: alg
Date: Wed Apr 17 13:15:11 2013
New Revision: 1468897

URL: http://svn.apache.org/r1468897
Log:
i122041 Added 'Automatic' to TextPropertyPanel FontColor and HilightColor, added 'No Color'
to ParagraphPropertyPanel BackgroundColor

Modified:
    openoffice/trunk/main/svx/inc/svx/dialogs.hrc
    openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx
    openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.hrc
    openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.src
    openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
    openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
    openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
    openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
    openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx
    openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.src

Modified: openoffice/trunk/main/svx/inc/svx/dialogs.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/inc/svx/dialogs.hrc?rev=1468897&r1=1468896&r2=1468897&view=diff
==============================================================================
--- openoffice/trunk/main/svx/inc/svx/dialogs.hrc (original)
+++ openoffice/trunk/main/svx/inc/svx/dialogs.hrc Wed Apr 17 13:15:11 2013
@@ -374,6 +374,7 @@
 #define RID_POPUPPANEL_PARAPAGE_LINESPACING (RID_SVX_START + 320)
 #define RID_POPUPPANEL_PARAPAGE_BULLETS     (RID_SVX_START + 321)
 #define RID_POPUPPANEL_PARAPAGE_NUMBERING   (RID_SVX_START + 322)
+#define RID_POPUPPANEL_PARAPAGE_BACK_COLOR  (RID_SVX_START + 323)
 
 // !!! IMPORTANT: consider and update RID_SVX_FIRSTFREE when introducing new RIDs !!! (see
above)
 

Modified: openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx?rev=1468897&r1=1468896&r2=1468897&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx (original)
+++ openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.cxx Wed Apr 17 13:15:11
2013
@@ -87,11 +87,6 @@ namespace {
         return bFound ? n : -1;
     }
 
-    Color GetTransparentColor (void)
-    {
-        return COL_TRANSPARENT;
-    }
-
     void FillLineEndListBox(ListBox& rListBoxStart, ListBox& rListBoxEnd, const XLineEndList&
rList)
     {
         const sal_uInt32 nCount(rList.Count());
@@ -916,10 +911,16 @@ IMPL_LINK( LinePropertyPanel, ChangeTran
 
 
 
+namespace 
+{
+    Color GetTransparentColor (void)
+    {
+        return COL_TRANSPARENT;
+    }
+} // end of anonymous namespace
+
 PopupControl* LinePropertyPanel::CreateColorPopupControl (PopupContainer* pParent)
 {
-    const ResId aResId(SVX_RES(STR_AUTOMATICE));
-    
     return new ColorControl(
         pParent,
         mpBindings,
@@ -928,7 +929,7 @@ PopupControl* LinePropertyPanel::CreateC
         ::boost::bind(GetTransparentColor),
         ::boost::bind(&LinePropertyPanel::SetColor, this, _1, _2),
         pParent,
-        &aResId);
+        0);
 }
 
 

Modified: openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.hrc
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.hrc?rev=1468897&r1=1468896&r2=1468897&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.hrc (original)
+++ openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.hrc Wed Apr 17 13:15:11
2013
@@ -71,7 +71,6 @@
 
 //color popup page
 #define VS_COLOR		1
-#define STR_AUTOMATICE	2
 
 //style popup page
 #define VS_STYLE				1

Modified: openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.src?rev=1468897&r1=1468896&r2=1468897&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.src (original)
+++ openoffice/trunk/main/svx/source/sidebar/line/LinePropertyPanel.src Wed Apr 17 13:15:11
2013
@@ -326,10 +326,6 @@ Control RID_POPUPPANEL_LINEPAGE_COLOR
 		TabStop = TRUE ;
 		Text = "Color";
 	};
-	String STR_AUTOMATICE
-	{
-		Text [ en-US ] = "No Color";
-	};
 };
 Control RID_POPUPPANEL_LINEPAGE_STYLE
 {

Modified: openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx?rev=1468897&r1=1468896&r2=1468897&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx (original)
+++ openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx Wed Apr 17 13:15:11
2013
@@ -767,11 +767,6 @@ void ParaPropertyPanel::ParaBKGStateChan
 	}
 }
 
-Color ParaPropertyPanel::GetBGColor (void) const
-{
-    return maColor;
-}
-
 void ParaPropertyPanel::SetBGColor (
     const String& /* rsColorName */,
     const Color aColor)
@@ -1538,17 +1533,27 @@ PopupControl* ParaPropertyPanel::CreateN
 	return new ParaNumberingControl(pParent, *this);
 }
 
+namespace 
+{
+    Color GetNoBackgroundColor(void)
+    {
+        return COL_TRANSPARENT;
+    }
+} // end of anonymous namespace
+
 PopupControl* ParaPropertyPanel::CreateBGColorPopupControl (PopupContainer* pParent)
 {
-	return new ColorControl(
+    const ResId aResId(SVX_RES(STR_NOFILL));
+
+    return new ColorControl(
         pParent,
         mpBindings,
-        SVX_RES(RID_POPUPPANEL_TEXTPAGE_FONT_COLOR),
+        SVX_RES(RID_POPUPPANEL_PARAPAGE_BACK_COLOR),
         SVX_RES(VS_FONT_COLOR),
-        ::boost::bind(&ParaPropertyPanel::GetBGColor, this),
+        ::boost::bind(GetNoBackgroundColor),
         ::boost::bind(&ParaPropertyPanel::SetBGColor, this, _1,_2),
         pParent,
-        0);
+        &aResId);
 }
 
 

Modified: openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx?rev=1468897&r1=1468896&r2=1468897&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx (original)
+++ openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx Wed Apr 17 13:15:11
2013
@@ -278,7 +278,6 @@ private:
 	void InitToolBoxSpacing();
 	void InitToolBoxLineSpacing();
 
-	Color GetBGColor (void) const;
 	void SetBGColor (const String& rsColorName, const Color aColor);
 };
 

Modified: openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src?rev=1468897&r1=1468896&r2=1468897&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src (original)
+++ openoffice/trunk/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src Wed Apr 17 13:15:11
2013
@@ -557,31 +557,27 @@ Control RID_SIDEBAR_PARA_PANEL
 };
 
 //===========================================Back color page==============================
-/*
 Control RID_POPUPPANEL_PARAPAGE_BACK_COLOR
 {
 	OutputSize = TRUE;
 	DialogControl = TRUE;
 	Border = FALSE;
-	
-	Size = MAP_APPFONT(  POPUP_COLOR_PICKER_WIDTH + POPUP_BORDER_WIDTH , POPUP_COLOR_PICKER_HEIGHT
+POPUP_BORDER_HEIGHT );
+	Size = MAP_APPFONT(  POPUP_COLOR_PICKER_WIDTH , POPUP_COLOR_PICKER_HEIGHT  );
 	
 	Control VS_FONT_COLOR
 	{
 		HelpID = HID_PPROPERTYPANEL_PARA_BACK_COLOR_VS ;
-	        Hide = TRUE ;
-	        Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
-	        Size = MAP_APPFONT (  POPUP_COLOR_PICKER_WIDTH , POPUP_COLOR_PICKER_HEIGHT );
+	    Hide = TRUE ;
+        Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
+        Size = MAP_APPFONT (  POPUP_COLOR_PICKER_WIDTH - OFFSET_X * 2, POPUP_COLOR_PICKER_HEIGHT
- OFFSET_Y * 2);
 		TabStop = TRUE ;
 		Text = "Color Picker";
 	};
-
 	String STR_NOFILL
 	{
 		Text [ en-US ] = "No Color";
 	};
-		
-};*/
+};
 
 //===========================================Bullet popup page==============================
 Control RID_POPUPPANEL_PARAPAGE_BULLETS

Modified: openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx?rev=1468897&r1=1468896&r2=1468897&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx (original)
+++ openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.cxx Wed Apr 17 13:15:11
2013
@@ -96,30 +96,42 @@ PopupControl* TextPropertyPanel::CreateU
 	return new TextUnderlineControl(pParent, *this);
 }
 
+namespace 
+{
+    Color GetAutomaticColor(void)
+    {
+        return COL_AUTO;
+    }
+} // end of anonymous namespace
+
 PopupControl* TextPropertyPanel::CreateFontColorPopupControl (PopupContainer* pParent)
 {
+    const ResId aResId(SVX_RES(STR_AUTOMATICE));
+
     return new ColorControl(
         pParent,
         mpBindings,
         SVX_RES(RID_POPUPPANEL_TEXTPAGE_FONT_COLOR),
         SVX_RES(VS_FONT_COLOR),
-        ::boost::bind(&TextPropertyPanel::GetFontColor, this),
+        ::boost::bind(GetAutomaticColor),
         ::boost::bind(&TextPropertyPanel::SetFontColor, this, _1,_2),
         pParent,
-        0);
+        &aResId);
 }
 
 PopupControl* TextPropertyPanel::CreateBrushColorPopupControl (PopupContainer* pParent)
 {
+    const ResId aResId(SVX_RES(STR_AUTOMATICE));
+
     return new ColorControl(
         pParent,
         mpBindings,
         SVX_RES(RID_POPUPPANEL_TEXTPAGE_FONT_COLOR),
         SVX_RES(VS_FONT_COLOR),
-        ::boost::bind(&TextPropertyPanel::GetBrushColor, this),
+        ::boost::bind(GetAutomaticColor),
         ::boost::bind(&TextPropertyPanel::SetBrushColor, this, _1,_2),
         pParent,
-        0);
+        &aResId);
 }
 
 long TextPropertyPanel::GetSelFontSize()
@@ -1550,11 +1562,6 @@ void  TextPropertyPanel::UpdateFontScrip
 	}
 }
 
-Color TextPropertyPanel::GetFontColor (void) const
-{
-    return maColor;
-}
-
 void TextPropertyPanel::SetFontColor (
     const String& /* rsColorName */,
     const Color aColor)
@@ -1564,11 +1571,6 @@ void TextPropertyPanel::SetFontColor (
 	maColor = aColor;
 }
 
-Color TextPropertyPanel::GetBrushColor (void) const
-{
-    return maBackColor;
-}
-
 void TextPropertyPanel::SetBrushColor (
     const String& /* rsColorName */,
     const Color aColor)

Modified: openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx?rev=1468897&r1=1468896&r2=1468897&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx (original)
+++ openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.hxx Wed Apr 17 13:15:11
2013
@@ -69,9 +69,7 @@ public:
     void SetSpacing(long nKern);
     void EndSpacingPopupMode (void);
     void EndUnderlinePopupMode (void);
-	Color GetFontColor (void) const;
 	void SetFontColor (const String& rsColorName,const Color aColor);
-	Color GetBrushColor (void) const;
 	void SetBrushColor (const String& rsColorName,const Color aColor);
 	void SetUnderline(FontUnderline	eUnderline);
 	Color& GetUnderlineColor(); 

Modified: openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.src
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.src?rev=1468897&r1=1468896&r2=1468897&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.src (original)
+++ openoffice/trunk/main/svx/source/sidebar/text/TextPropertyPanel.src Wed Apr 17 13:15:11
2013
@@ -599,7 +599,6 @@ Control RID_POPUPPANEL_TEXTPAGE_FONT_COL
 	
 	Control VS_FONT_COLOR
 	{
-//		HelpID = HID_COLOR_VS ;
 		HelpID = HID_PPROPERTYPANEL_TEXT_COLOR_VS;
         Hide = TRUE ;
         Pos = MAP_APPFONT ( OFFSET_X , OFFSET_Y );
@@ -611,7 +610,6 @@ Control RID_POPUPPANEL_TEXTPAGE_FONT_COL
 	{
 		Text [ en-US ] = "Automatic";
 	};
-
 };
 
 Control RID_POPUPPANEL_TEXTPAGE_SPACING



Mime
View raw message