UnoControls/source/controls/framecontrol.cxx |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit a25778abd898fae829d3910798f32089e455984c
Author: Noel Grandin <[email protected]>
Date:   Thu Jul 18 13:07:40 2013 +0200

    fix warning
    
    "-Werror=unused-macros" was firing on non-debug builds, fix by inlining
    the relevant warning message macro.
    
    Change-Id: If2fba2410bf985ec51faaa94c61b2e224fc65328

diff --git a/UnoControls/source/controls/framecontrol.cxx 
b/UnoControls/source/controls/framecontrol.cxx
index ae4556d..957a333 100644
--- a/UnoControls/source/controls/framecontrol.cxx
+++ b/UnoControls/source/controls/framecontrol.cxx
@@ -51,7 +51,6 @@ namespace unocontrols{
 #define PROPERTYNAME_LOADERARGUMENTS                    "LoaderArguments"
 #define PROPERTYNAME_COMPONENTURL                       "ComponentURL"
 #define PROPERTYNAME_FRAME                              "Frame"
-#define ERRORTEXT_VOSENSHURE                            "This is an invalid 
property handle."
 #define PROPERTY_COUNT                                  3                      
                                 // you must count the propertys
 #define PROPERTYHANDLE_COMPONENTURL                     0                      
                                 // Id must be the index into the array
 #define PROPERTYHANDLE_FRAME                            1
@@ -370,7 +369,7 @@ void FrameControl::setFastPropertyValue_NoBroadcast(        
    sal_Int32   nHan
         case PROPERTYHANDLE_LOADERARGUMENTS     :       rValue >>= 
m_seqLoaderArguments ;
                                                         break ;
 
-        default :                                       OSL_ENSURE ( nHandle 
== -1, ERRORTEXT_VOSENSHURE ) ;
+        default :                                       OSL_ENSURE ( nHandle 
== -1, "This is an invalid property handle." ) ;
     }
 }
 
@@ -394,7 +393,7 @@ void FrameControl::getFastPropertyValue(    Any&        
rRet    ,
         case PROPERTYHANDLE_FRAME           :       rRet <<= m_xFrame ;
                                                        break ;
 
-        default :                                   OSL_ENSURE ( nHandle == 
-1, ERRORTEXT_VOSENSHURE ) ;
+        default :                                   OSL_ENSURE ( nHandle == 
-1, "This is an invalid property handle." ) ;
     }
 }
 
_______________________________________________
Libreoffice-commits mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Reply via email to