svn commit: r1451166 - in /openoffice/trunk/main/fpicker/source/aqua: ControlHelper.cxx ControlHelper.hxx

[hdu]

Author: hdu
Date: Thu Feb 28 10:19:35 2013
New Revision: 1451166

URL: http://svn.apache.org/r1451166
Log:
fpicker: fix some const-correctness issues

AOO would get along fine keeping these NSStrings const, but
Cocoa APIs such as setTitle require non-const NSString arguments

Modified:
    openoffice/trunk/main/fpicker/source/aqua/ControlHelper.cxx
    openoffice/trunk/main/fpicker/source/aqua/ControlHelper.hxx

Modified: openoffice/trunk/main/fpicker/source/aqua/ControlHelper.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/source/aqua/ControlHelper.cxx?rev=1451166&r1=1451165&r2=1451166&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/source/aqua/ControlHelper.cxx (original)
+++ openoffice/trunk/main/fpicker/source/aqua/ControlHelper.cxx Thu Feb 28 
10:19:35 2013
@@ -217,7 +217,7 @@ OUString ControlHelper::getLabel( sal_In
     return retVal;
 }
 
-void ControlHelper::setLabel( sal_Int16 nControlId, const NSString* aLabel )
+void ControlHelper::setLabel( sal_Int16 nControlId, NSString* aLabel )
 {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__, "controlId", nControlId, "label", 
aLabel);
 
@@ -954,7 +954,7 @@ void ControlHelper::createFilterControl(
     DBG_PRINT_EXIT(CLASS_NAME, __func__);
 }
 
-NSTextField* ControlHelper::createLabelWithString(const NSString* labelString) 
{
+NSTextField* ControlHelper::createLabelWithString(NSString* labelString) {
     DBG_PRINT_ENTRY(CLASS_NAME, __func__, "label", labelString);
 
     NSTextField *textField = [NSTextField new];

Modified: openoffice/trunk/main/fpicker/source/aqua/ControlHelper.hxx
URL: 
http://svn.apache.org/viewvc/openoffice/trunk/main/fpicker/source/aqua/ControlHelper.hxx?rev=1451166&r1=1451165&r2=1451166&view=diff
==============================================================================
--- openoffice/trunk/main/fpicker/source/aqua/ControlHelper.hxx (original)
+++ openoffice/trunk/main/fpicker/source/aqua/ControlHelper.hxx Thu Feb 28 
10:19:35 2013
@@ -62,7 +62,7 @@ public:
     uno::Any   getValue( sal_Int16 nControlId, sal_Int16 nControlAction ) 
const;
     void       enableControl( sal_Int16 nControlId, sal_Bool bEnable ) const;
     OUString   getLabel( sal_Int16 nControlId );
-    void       setLabel( sal_Int16 nControlId, const NSString* aLabel );
+    void       setLabel( sal_Int16 nControlId, NSString* aLabel );
 
     
//------------------------------------------------------------------------------------
     // other stuff
@@ -179,7 +179,7 @@ private:
     void         createControls();
     void         createFilterControl();
     void         createUserPane();
-    NSTextField* createLabelWithString(const NSString* label);
+    NSTextField* createLabelWithString( NSString* label);
     
     int          getControlElementName(const Class clazz, const int 
nControlId) const;
     NSControl*   getControl( const sal_Int16 nControlId ) const;