You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by al...@apache.org on 2013/03/31 17:38:59 UTC

svn commit: r1462991 - in /openoffice/branches/sidebar/main/svx/source/sidebar: line/LinePropertyPanel.cxx possize/PosSizePropertyPanel.cxx possize/SidebarDialControlBmp.cxx

Author: alg
Date: Sun Mar 31 15:38:59 2013
New Revision: 1462991

URL: http://svn.apache.org/r1462991
Log:
i121799 linux build corrections

Modified:
    openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.cxx
    openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
    openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControlBmp.cxx

Modified: openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.cxx?rev=1462991&r1=1462990&r2=1462991&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/line/LinePropertyPanel.cxx Sun Mar 31 15:38:59 2013
@@ -919,6 +919,8 @@ IMPL_LINK( LinePropertyPanel, ChangeTran
 
 PopupControl* LinePropertyPanel::CreateColorPopupControl (PopupContainer* pParent)
 {
+    const ResId aResId(SVX_RES(STR_AUTOMATICE));
+    
     return new ColorControl(
         pParent,
         mpBindings,
@@ -927,7 +929,7 @@ PopupControl* LinePropertyPanel::CreateC
         ::boost::bind(GetTransparentColor),
         ::boost::bind(&LinePropertyPanel::SetColor, this, _1, _2),
         pParent,
-        &SVX_RES(STR_AUTOMATICE));
+        &aResId);
 }
 
 

Modified: openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx?rev=1462991&r1=1462990&r2=1462991&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/possize/PosSizePropertyPanel.cxx Sun Mar 31 15:38:59 2013
@@ -451,7 +451,7 @@ void PosSizePropertyPanel::HandleContext
 
 
 
-IMPL_LINK( PosSizePropertyPanel, ChangeWidthHdl, void*, pBox )
+IMPL_LINK( PosSizePropertyPanel, ChangeWidthHdl, void*, /*pBox*/ )
 {
 	if( mpCbxScale->IsChecked() &&
 		mpCbxScale->IsEnabled() )

Modified: openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControlBmp.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControlBmp.cxx?rev=1462991&r1=1462990&r2=1462991&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControlBmp.cxx (original)
+++ openoffice/branches/sidebar/main/svx/source/sidebar/possize/SidebarDialControlBmp.cxx Sun Mar 31 15:38:59 2013
@@ -48,7 +48,7 @@ SidebarDialControlBmp::~SidebarDialContr
 
 
 void SidebarDialControlBmp::DrawElements (
-    const String& rText,
+    const String& /*rText*/,
     sal_Int32 nAngle)
 {
     if (Application::GetSettings().GetLayoutRTL())