Commits

Martin Hollmichel  committed 2b6fbfd

#i109930# consistent header files

  • Participants
  • Parent commits 5c3ffd9

Comments (0)

Files changed (7)

File extensions/source/abpilot/admininvokationimpl.cxx

 #include <com/sun/star/awt/XWindow.hpp>
 #include <vcl/stdtext.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #ifndef EXTENSIONS_ABPRESID_HRC
 #include "abpresid.hrc"

File extensions/source/abpilot/fieldmappingimpl.cxx

 #include <com/sun/star/sdb/CommandType.hpp>
 #include <tools/debug.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ 
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <vcl/stdtext.hxx>
 #include <com/sun/star/util/AliasProgrammaticPair.hpp>

File extensions/source/propctrlr/fontdialog.cxx

 #endif
 #include <vcl/svapp.hxx>
 #ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_
-#include <toolkit/unohlp.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
 #endif
 #include <comphelper/types.hxx>
 #include <comphelper/extract.hxx>
 			return _nDefault;
 
 		sal_Int32 nValue(_nDefault);
-		::cppu::enum2int(nValue, aValue);
+		::comphelper::enum2int(nValue, aValue);
 		return (sal_Int16)nValue;
 	}
 
 			return _nDefault;
 
 		sal_Int32 nValue(_nDefault);
-		::cppu::enum2int(nValue, aValue);
+		::comphelper::enum2int(nValue, aValue);
 		return nValue;
 	}
 
 			sal_Int16 nFontEmphasisMark		= aPropExtractor.getInt16FontProperty(PROPERTY_FONT_EMPHASIS_MARK, aDefaultVCLFont.GetEmphasisMark());
 
 			Any aValue;
-			sal_Bool bWordLineMode			= aPropExtractor.getCheckFontProperty(PROPERTY_WORDLINEMODE, aValue) ? aDefaultFont.WordLineMode : ::cppu::any2bool(aValue);
+			sal_Bool bWordLineMode			= aPropExtractor.getCheckFontProperty(PROPERTY_WORDLINEMODE, aValue) ? aDefaultFont.WordLineMode : ::comphelper::any2bool(aValue);
 			sal_Int32 nColor32				= aPropExtractor.getInt32FontProperty(PROPERTY_TEXTCOLOR, 0);
 
 			// build SfxItems with the values
 				const SvxWordLineModeItem& rWordLineModeItem =
 					static_cast<const SvxWordLineModeItem&>(_rSet.Get(CFID_WORDLINEMODE));
 
-				lcl_pushBackPropertyValue( _out_properties, PROPERTY_WORDLINEMODE, ::cppu::bool2any(rWordLineModeItem.GetValue()));
+				lcl_pushBackPropertyValue( _out_properties, PROPERTY_WORDLINEMODE, ::comphelper::bool2any(rWordLineModeItem.GetValue()));
 			}
 
 

File extensions/source/propctrlr/formcomponenthandler.cxx

         Any aListSourceType( m_xComponent->getPropertyValue( PROPERTY_LISTSOURCETYPE ) );
 
         sal_Int32 nListSourceType = ListSourceType_VALUELIST;
-        ::cppu::enum2int( nListSourceType, aListSourceType );
+        ::comphelper::enum2int( nListSourceType, aListSourceType );
 
         _out_rDescriptor.DisplayName = m_pInfoService->getPropertyTranslation( PROPERTY_ID_LISTSOURCE );
         _out_rDescriptor.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( PROPERTY_ID_LISTSOURCE ) );
         if (xController.is())
         {
             // do a preview by default
-            xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, ::cppu::bool2any(sal_True));
-
-            xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, ::cppu::bool2any(bIsLink));
+            xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, ::comphelper::bool2any(sal_True));
+
+            xController->setValue(ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, ::comphelper::bool2any(bIsLink));
             xController->enableControl(ExtendedFilePickerElementIds::CHECKBOX_LINK, bHandleNonLink );
 
         }

File extensions/source/propctrlr/formmetadata.cxx

 #include "propctrlr.hrc"
 #include <svtools/localresaccess.hxx>
 #include <tools/debug.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 
 #include <algorithm>
 #include <functional>
             switch ( m_aType.getTypeClass() )
             {
                 case TypeClass_ENUM:
-                    _out_rValue = ::cppu::int2enum( nPos, m_aType );
+                    _out_rValue = ::comphelper::int2enum( nPos, m_aType );
                     break;
 
                 case TypeClass_SHORT:
     {
         ::rtl::OUString sReturn;
 		sal_Int32 nIntValue = -1;
-		OSL_VERIFY( ::cppu::enum2int( nIntValue, _rEnumValue ) );
+		OSL_VERIFY( ::comphelper::enum2int( nIntValue, _rEnumValue ) );
 
         sal_uInt32 nUIFlags = m_rMetaData.getPropertyUIFlags( m_nPropertyId );
         if ( ( nUIFlags & PROP_FLAG_ENUM_ONE ) == PROP_FLAG_ENUM_ONE )

File extensions/source/propctrlr/genericpropertyhandler.cxx

 #include <com/sun/star/frame/XDispatchProvider.hpp>
 /** === end UNO includes === **/
 #include <tools/debug.hxx>
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 
 #include <algorithm>
 
         impl_getValues( aValues );
 
         if ( ( index >= 0 ) && ( index < aValues.getLength() ) )
-            _out_rValue = ::cppu::int2enum( aValues[ index ], m_aEnumType );
+            _out_rValue = ::comphelper::int2enum( aValues[ index ], m_aEnumType );
         else
         {
             DBG_ERROR( "EnumRepresentation::getValueFromDescription: cannot convert!" );
         ::rtl::OUString sDescription;
 
         sal_Int32 nAsInt = 0;
-        OSL_VERIFY( ::cppu::enum2int( nAsInt, _rEnumValue ) );
+        OSL_VERIFY( ::comphelper::enum2int( nAsInt, _rEnumValue ) );
 
         Sequence< sal_Int32 > aValues;
         impl_getValues( aValues );

File extensions/source/propctrlr/pushbuttonnavigation.cxx

 #include <com/sun/star/form/FormButtonType.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include "formstrings.hxx"
-#include <cppuhelper/extract.hxx>
+#include <comphelper/extract.hxx>
 #include <comphelper/property.hxx>
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
         sal_Int32 nButtonType = FormButtonType_PUSH;
         if ( !m_xControlModel.is() )
             return nButtonType;
-        OSL_VERIFY( ::cppu::enum2int( nButtonType, m_xControlModel->getPropertyValue( PROPERTY_BUTTONTYPE ) ) );
+        OSL_VERIFY( ::comphelper::enum2int( nButtonType, m_xControlModel->getPropertyValue( PROPERTY_BUTTONTYPE ) ) );
 
         if ( nButtonType == FormButtonType_URL )
         {
         try
         {
             sal_Int32 nButtonType = FormButtonType_PUSH;
-            OSL_VERIFY( ::cppu::enum2int( nButtonType, _rValue ) );
+            OSL_VERIFY( ::comphelper::enum2int( nButtonType, _rValue ) );
             ::rtl::OUString sTargetURL;
 
             bool bIsVirtualButtonType = nButtonType >= s_nFirstVirtualButtonType;
                 if ( eState == PropertyState_DIRECT_VALUE )
                 {
                     sal_Int32 nRealButtonType = FormButtonType_PUSH;
-                    OSL_VERIFY( ::cppu::enum2int( nRealButtonType, m_xControlModel->getPropertyValue( PROPERTY_BUTTONTYPE ) ) );
+                    OSL_VERIFY( ::comphelper::enum2int( nRealButtonType, m_xControlModel->getPropertyValue( PROPERTY_BUTTONTYPE ) ) );
                     // perhaps it's one of the virtual button types?
                     if ( FormButtonType_URL == nRealButtonType )
                     {