diff options
75 files changed, 127 insertions, 127 deletions
diff --git a/connectivity/source/commontools/RowFunctionParser.cxx b/connectivity/source/commontools/RowFunctionParser.cxx index 4435efb7f795..5abaaaa35393 100644 --- a/connectivity/source/commontools/RowFunctionParser.cxx +++ b/connectivity/source/commontools/RowFunctionParser.cxx @@ -246,7 +246,7 @@ class UnaryFunctionFunctor const ExpressionFunct meFunct; ParserContextSharedPtr mpContext; -public : +public: UnaryFunctionFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr& rContext ) : meFunct( eFunct ), diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx index 08541f81e2e1..22558265a411 100644 --- a/cui/source/inc/cuihyperdlg.hxx +++ b/cui/source/inc/cuihyperdlg.hxx @@ -37,12 +37,12 @@ class SvxHpLinkDlg; class SvxHlinkCtrl : public SfxControllerItem { -private : +private: VclPtr<SvxHpLinkDlg> pParent; SfxStatusForwarder aRdOnlyForwarder; -public : +public: SvxHlinkCtrl( sal_uInt16 nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg); virtual void dispose() SAL_OVERRIDE; diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx index 854a3d391605..3e52b449d281 100644 --- a/cui/source/inc/iconcdlg.hxx +++ b/cui/source/inc/iconcdlg.hxx @@ -69,7 +69,7 @@ class IconChoicePage : public TabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; -private : +private: const SfxItemSet* pSet; OUString aUserString; bool bHasExchangeSupport; @@ -77,12 +77,12 @@ private : void ImplInitSettings(); -protected : +protected: IconChoicePage( vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet ); sal_uInt16 GetWhich( sal_uInt16 nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); } -public : +public: virtual ~IconChoicePage(); virtual void dispose() SAL_OVERRIDE; @@ -114,7 +114,7 @@ public : class IconChoiceDialog : public ModalDialog { -private : +private: friend class IconChoicePage; ::std::vector< IconChoicePageData* > maPageList; @@ -153,7 +153,7 @@ private : void FocusOnIcon ( sal_uInt16 nId ); -protected : +protected: static void ShowPageImpl ( IconChoicePageData* pData ); static void HidePageImpl ( IconChoicePageData* pData ); @@ -169,7 +169,7 @@ protected : short Ok(); -public : +public: // the IconChoiceCtrl's could also be set in the Ctor IconChoiceDialog ( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, diff --git a/extensions/source/config/ldap/ldapuserprofilebe.hxx b/extensions/source/config/ldap/ldapuserprofilebe.hxx index 983f833466b0..fff0b6bbb5e8 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.hxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.hxx @@ -52,7 +52,7 @@ struct LdapProfileMutexHolder { osl::Mutex mMutex; }; */ class LdapUserProfileBe : private LdapProfileMutexHolder, public BackendBase { - public : + public: LdapUserProfileBe(const uno::Reference<uno::XComponentContext>& xContext); virtual ~LdapUserProfileBe() ; diff --git a/filter/source/graphicfilter/idxf/dxfentrd.hxx b/filter/source/graphicfilter/idxf/dxfentrd.hxx index 83b991005141..dd02daca1d93 100644 --- a/filter/source/graphicfilter/idxf/dxfentrd.hxx +++ b/filter/source/graphicfilter/idxf/dxfentrd.hxx @@ -325,7 +325,7 @@ class DXFLWPolyLineEntity : public DXFBasicEntity { sal_Int32 nIndex; - public : + public: sal_Int32 nCount; // 90 sal_Int32 nFlags; // 70 1 = closed, 128 = plinegen @@ -338,7 +338,7 @@ class DXFLWPolyLineEntity : public DXFBasicEntity DXFLWPolyLineEntity(); virtual ~DXFLWPolyLineEntity(); - protected : + protected: virtual void EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE; @@ -351,7 +351,7 @@ struct DXFEdgeType virtual ~DXFEdgeType(){}; virtual bool EvaluateGroup( DXFGroupReader & /*rDGR*/ ){ return true; }; - protected : + protected: DXFEdgeType( sal_Int32 EdgeType ):nEdgeType(EdgeType){}; }; @@ -429,7 +429,7 @@ class DXFHatchEntity : public DXFBasicEntity bool bIsInBoundaryPathContext; sal_Int32 nCurrentBoundaryPathIndex; - public : + public: DXFVector aElevationPoint; sal_Int32 nFlags; // 70 (solid fill = 1, pattern fill = 0) @@ -449,7 +449,7 @@ class DXFHatchEntity : public DXFBasicEntity DXFHatchEntity(); virtual ~DXFHatchEntity(); - protected : + protected: virtual void EvaluateGroup( DXFGroupReader & rDGR ) SAL_OVERRIDE; }; diff --git a/hwpfilter/source/hwpfile.h b/hwpfilter/source/hwpfile.h index f044b5d053d9..9bebba4f0f5f 100644 --- a/hwpfilter/source/hwpfile.h +++ b/hwpfilter/source/hwpfile.h @@ -252,7 +252,7 @@ class DLLEXPORT HWPFile int getMaxSettedPage(){ return m_nMaxSettedPage; } void setMaxSettedPage(){ m_nMaxSettedPage = m_nCurrentPage; } - private : + private: int compareCharShape(CharShape *shape); int compareParaShape(ParaShape *shape); diff --git a/i18npool/inc/breakiteratorImpl.hxx b/i18npool/inc/breakiteratorImpl.hxx index beb857243e7b..f97133c3e55e 100644 --- a/i18npool/inc/breakiteratorImpl.hxx +++ b/i18npool/inc/breakiteratorImpl.hxx @@ -113,7 +113,7 @@ public: protected: Boundary result; // for word break iterator -private : +private: struct lookupTableItem { lookupTableItem(const com::sun::star::lang::Locale& _aLocale, com::sun::star::uno::Reference < XBreakIterator >& _xBI) : aLocale(_aLocale), xBI(_xBI) {}; diff --git a/i18npool/inc/chaptercollator.hxx b/i18npool/inc/chaptercollator.hxx index 96286b3433f2..74ff2fc406d7 100644 --- a/i18npool/inc/chaptercollator.hxx +++ b/i18npool/inc/chaptercollator.hxx @@ -44,7 +44,7 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; -private : +private: // CharacterClassification Implementation com::sun::star::uno::Reference< XCharacterClassification > cclass; }; diff --git a/i18npool/inc/collatorImpl.hxx b/i18npool/inc/collatorImpl.hxx index 99895914c272..60fd79fae798 100644 --- a/i18npool/inc/collatorImpl.hxx +++ b/i18npool/inc/collatorImpl.hxx @@ -75,7 +75,7 @@ public: protected: lang::Locale nLocale; -private : +private: struct lookupTableItem { lang::Locale aLocale; OUString algorithm; diff --git a/i18npool/inc/inputsequencechecker.hxx b/i18npool/inc/inputsequencechecker.hxx index 510b8aa1bd3a..e985177b4e5f 100644 --- a/i18npool/inc/inputsequencechecker.hxx +++ b/i18npool/inc/inputsequencechecker.hxx @@ -56,7 +56,7 @@ public: virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; -private : +private: const sal_Char *serviceName; struct lookupTableItem { diff --git a/i18npool/inc/localedata.hxx b/i18npool/inc/localedata.hxx index 8bf9ef837cd4..e5adbe714134 100644 --- a/i18npool/inc/localedata.hxx +++ b/i18npool/inc/localedata.hxx @@ -121,7 +121,7 @@ public: virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; -private : +private: friend bool operator ==(const com::sun::star::lang::Locale& l1, const com::sun::star::lang::Locale& l2); ::std::unique_ptr< LocaleDataLookupTableItem > cachedItem; diff --git a/i18npool/inc/textconversion.hxx b/i18npool/inc/textconversion.hxx index 6a41d9288a77..a7f81ce18d3f 100644 --- a/i18npool/inc/textconversion.hxx +++ b/i18npool/inc/textconversion.hxx @@ -83,7 +83,7 @@ public: throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; private: const sal_Char* implementationName; -protected : +protected: #ifndef DISABLE_DYNLOADING oslModule hModule; oslGenericFunction SAL_CALL getFunctionBySymbol(const sal_Char* func); @@ -135,7 +135,7 @@ public: com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException, std::exception ) SAL_OVERRIDE; -private : +private: // Hangul/Hanja system dictionary com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionary > xCD; // Hangul/Hanja user defined dictionary list @@ -190,7 +190,7 @@ public: throw( com::sun::star::uno::RuntimeException, com::sun::star::lang::IllegalArgumentException, com::sun::star::lang::NoSupportException, std::exception ) SAL_OVERRIDE; -private : +private: // user defined dictionary list com::sun::star::uno::Reference < com::sun::star::linguistic2::XConversionDictionaryList > xCDL; OUString SAL_CALL getWordConversion(const OUString& aText, diff --git a/i18npool/inc/textconversionImpl.hxx b/i18npool/inc/textconversionImpl.hxx index 1320f38b0c8e..93fdabfd4ddd 100644 --- a/i18npool/inc/textconversionImpl.hxx +++ b/i18npool/inc/textconversionImpl.hxx @@ -78,7 +78,7 @@ public: com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( com::sun::star::uno::RuntimeException, std::exception ) SAL_OVERRIDE; -private : +private: com::sun::star::lang::Locale aLocale; com::sun::star::uno::Reference < com::sun::star::i18n::XExtendedTextConversion > xTC; com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > m_xContext; diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 68024ca781dc..b60847a0568c 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -359,7 +359,7 @@ enum DffSeekToContentMode class MSFILTER_DLLPUBLIC DffRecordManager : public DffRecordList { -public : +public: DffRecordList* pCList; void Clear(); @@ -407,7 +407,7 @@ class MSFILTER_DLLPUBLIC SvxMSDffManager : public DffPropertyReader void CheckTxBxStoryChain(); void GetFidclData(sal_uInt32 nOffsDgg); -protected : +protected: typedef std::map<sal_uInt32, sal_uInt32> OffsetMap; OUString maBaseURL; diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 884b485a2cec..b864c67d96ee 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -719,7 +719,7 @@ class PPTExtParaProv { PPTBuGraEntryList aBuGraList; -public : +public: bool bStyles; bool bGraphics; DffRecordManager aExtendedPresRules; @@ -1287,7 +1287,7 @@ class PPTConvertOCXControls : public SvxMSConvertOCXControls PptPageKind ePageKind; const SdrPowerPointImport* mpPPTImporter; com::sun::star::uno::Reference< com::sun::star::io::XInputStream > mxInStrm; -public : +public: PPTConvertOCXControls( const SdrPowerPointImport* pPPTImporter, com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& rxInStrm, const com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxModel, PptPageKind ePKind ) : SvxMSConvertOCXControls ( rxModel ), diff --git a/include/salhelper/singletonref.hxx b/include/salhelper/singletonref.hxx index c1ea6faebbcd..7b2df10fa9f5 100644 --- a/include/salhelper/singletonref.hxx +++ b/include/salhelper/singletonref.hxx @@ -67,7 +67,7 @@ class SingletonRef // member - private : + private: /** @short pointer to the internal wrapped singleton. */ static SingletonClass* m_pInstance; @@ -78,7 +78,7 @@ class SingletonRef // interface - public : + public: @@ -156,7 +156,7 @@ class SingletonRef // helper - private : + private: diff --git a/include/sfx2/sidebar/UnoSidebar.hxx b/include/sfx2/sidebar/UnoSidebar.hxx index 9cbb4e1fcfb2..687ecb2cfb94 100644 --- a/include/sfx2/sidebar/UnoSidebar.hxx +++ b/include/sfx2/sidebar/UnoSidebar.hxx @@ -32,7 +32,7 @@ class SfxUnoSidebar : public ::cppu::WeakImplHelper1< css::ui::XSidebarProvider > { -private : +private: const css::uno::Reference<css::frame::XFrame> xFrame; sfx2::sidebar::SidebarController* getSidebarController(); diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 9cba4d53c7cf..b601b9b15261 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -28,7 +28,7 @@ class SVT_DLLPUBLIC PlaceEditDialog : public ModalDialog { -private : +private: VclPtr<Edit> m_pEDServerName; VclPtr<ListBox> m_pLBServerType; std::shared_ptr< DetailsContainer > m_xCurrentDetails; @@ -53,7 +53,7 @@ private : unsigned int m_nCurrentType; -public : +public: PlaceEditDialog( vcl::Window* pParent); PlaceEditDialog(vcl::Window* pParent, const std::shared_ptr<Place> &rPlace ); diff --git a/include/svtools/filechangedchecker.hxx b/include/svtools/filechangedchecker.hxx index fe53a57209f9..a91642dd55db 100644 --- a/include/svtools/filechangedchecker.hxx +++ b/include/svtools/filechangedchecker.hxx @@ -23,7 +23,7 @@ */ class SVT_DLLPUBLIC FileChangedChecker { -private : +private: Idle mIdle; OUString mFileName; TimeValue mLastModTime; @@ -32,7 +32,7 @@ private : bool SVT_DLLPRIVATE getCurrentModTime(TimeValue& o_rValue) const; DECL_LINK_TYPED(TimerHandler, Idle *, void); -public : +public: void resetTimer(); bool hasFileChanged(); FileChangedChecker(const OUString& rFilename, const ::boost::function0<void>& rCallback); diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index 1a0260566294..0811a67fef61 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -145,7 +145,7 @@ class SVX_DLLPUBLIC EnhancedCustomShape2d : public SfxItemSet SAL_DLLPRIVATE void SetPathSize( sal_Int32 nIndex = 0 ); - public : + public: struct SAL_DLLPRIVATE Handle { diff --git a/include/svx/e3dundo.hxx b/include/svx/e3dundo.hxx index 29e2eb59df6f..8b13a5dc18a1 100644 --- a/include/svx/e3dundo.hxx +++ b/include/svx/e3dundo.hxx @@ -32,7 +32,7 @@ class SAL_WARN_UNUSED E3dUndoAction : public SdrUndoAction { - protected : + protected: E3dObject *pMy3DObj; public: diff --git a/include/svx/obj3d.hxx b/include/svx/obj3d.hxx index 0f2dacb157fb..a4c97f6be210 100644 --- a/include/svx/obj3d.hxx +++ b/include/svx/obj3d.hxx @@ -243,7 +243,7 @@ protected: // convert given basegfx::B3DPolyPolygon to screen coor basegfx::B2DPolyPolygon TransformToScreenCoor(const basegfx::B3DPolyPolygon& rCandidate); -public : +public: TYPEINFO_OVERRIDE(); E3dCompoundObject(); diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx index f3d5277229ac..79610690bba4 100644 --- a/include/svx/sdasaitm.hxx +++ b/include/svx/sdasaitm.hxx @@ -35,7 +35,7 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem { std::vector<SdrCustomShapeAdjustmentValue> aAdjustmentValueList; - public : + public: TYPEINFO_OVERRIDE(); SVX_DLLPUBLIC SdrCustomShapeAdjustmentItem(); diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index a701f37fb7bf..739c51db106e 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -49,7 +49,7 @@ private: com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > aPropSeq; - public : + public: TYPEINFO_OVERRIDE(); @@ -87,7 +87,7 @@ private: class SdrCustomShapeReplacementURLItem : public SfxStringItem { - public : + public: SdrCustomShapeReplacementURLItem(); }; diff --git a/include/svx/sidebar/Popup.hxx b/include/svx/sidebar/Popup.hxx index ebd91bb9fa90..32ff0abf96fd 100644 --- a/include/svx/sidebar/Popup.hxx +++ b/include/svx/sidebar/Popup.hxx @@ -39,7 +39,7 @@ namespace svx { namespace sidebar { */ class SVX_DLLPUBLIC Popup { -public : +public: /** Create a Popup wrapper object. @param pParent Parent window of the PopupContainer, which in turn is the diff --git a/include/svx/sidebar/PopupControl.hxx b/include/svx/sidebar/PopupControl.hxx index df3f75a97fe7..b518590a0f32 100644 --- a/include/svx/sidebar/PopupControl.hxx +++ b/include/svx/sidebar/PopupControl.hxx @@ -34,7 +34,7 @@ namespace svx { namespace sidebar { class SVX_DLLPUBLIC PopupControl : public Control { -public : +public: PopupControl ( vcl::Window* pParent, const ResId& rResId); diff --git a/include/svx/sidebar/SelectionAnalyzer.hxx b/include/svx/sidebar/SelectionAnalyzer.hxx index ae4970bd67d8..62c411624f2e 100644 --- a/include/svx/sidebar/SelectionAnalyzer.hxx +++ b/include/svx/sidebar/SelectionAnalyzer.hxx @@ -35,7 +35,7 @@ namespace svx { namespace sidebar { */ class SVX_DLLPUBLIC SelectionAnalyzer { -public : +public: static sfx2::sidebar::EnumContext::Context GetContextForSelection_SC ( const SdrMarkList& rMarkList); diff --git a/include/vcl/FilterConfigItem.hxx b/include/vcl/FilterConfigItem.hxx index ccee439b74af..567377f3d98c 100644 --- a/include/vcl/FilterConfigItem.hxx +++ b/include/vcl/FilterConfigItem.hxx @@ -55,7 +55,7 @@ class VCL_DLLPUBLIC FilterConfigItem ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rPropSeq, const ::com::sun::star::beans::PropertyValue& rPropValue ); -public : +public: FilterConfigItem( const OUString& rSubTree ); FilterConfigItem( ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData ); diff --git a/include/vcl/pdfextoutdevdata.hxx b/include/vcl/pdfextoutdevdata.hxx index 85541fe1817b..528f5fc1c403 100644 --- a/include/vcl/pdfextoutdevdata.hxx +++ b/include/vcl/pdfextoutdevdata.hxx @@ -94,7 +94,7 @@ class VCL_DLLPUBLIC PDFExtOutDevData : public ExtOutDevData std::vector< PDFExtOutDevBookmarkEntry > maBookmarks; -public : +public: TYPEINFO_OVERRIDE(); PDFExtOutDevData( const OutputDevice& rOutDev ); diff --git a/include/xmloff/numehelp.hxx b/include/xmloff/numehelp.hxx index 64c0e163c567..053772dfd3f3 100644 --- a/include/xmloff/numehelp.hxx +++ b/include/xmloff/numehelp.hxx @@ -79,7 +79,7 @@ class XMLOFF_DLLPUBLIC XMLNumberFormatAttributesExportHelper const OUString msCurrencySymbol; const OUString msCurrencyAbbreviation; XMLNumberFormatSet aNumberFormats; -public : +public: XMLNumberFormatAttributesExportHelper(::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier); XMLNumberFormatAttributesExportHelper(::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier >& xNumberFormatsSupplier, SvXMLExport& rExport ); diff --git a/rsc/inc/rsclex.hxx b/rsc/inc/rsclex.hxx index f98a7506e552..c05fd0ce6d24 100644 --- a/rsc/inc/rsclex.hxx +++ b/rsc/inc/rsclex.hxx @@ -65,9 +65,9 @@ struct Node class ObjectStack { - private : + private: Node* pRoot; - public : + public: ObjectStack () { pRoot = NULL; } diff --git a/sc/source/filter/inc/scflt.hxx b/sc/source/filter/inc/scflt.hxx index ee5d5760e0a3..73b26f4b64df 100644 --- a/sc/source/filter/inc/scflt.hxx +++ b/sc/source/filter/inc/scflt.hxx @@ -614,7 +614,7 @@ private: //Range-Data class Sc10NameData : public ScDataObject { -public : +public: sal_Char Name[32]; sal_Char Reference[64]; sal_Char Reserved[12]; diff --git a/sc/source/ui/sidebar/CellBorderStylePopup.hxx b/sc/source/ui/sidebar/CellBorderStylePopup.hxx index 62899d555ae8..4b66db521c45 100644 --- a/sc/source/ui/sidebar/CellBorderStylePopup.hxx +++ b/sc/source/ui/sidebar/CellBorderStylePopup.hxx @@ -26,7 +26,7 @@ namespace sc { namespace sidebar { class CellBorderStylePopup : public svx::sidebar::Popup { -public : +public: CellBorderStylePopup( vcl::Window* pParent, const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator); diff --git a/sc/source/ui/sidebar/CellLineStylePopup.hxx b/sc/source/ui/sidebar/CellLineStylePopup.hxx index 757a86a8af2c..c7cdbce529a3 100644 --- a/sc/source/ui/sidebar/CellLineStylePopup.hxx +++ b/sc/source/ui/sidebar/CellLineStylePopup.hxx @@ -26,7 +26,7 @@ namespace sc { namespace sidebar { class CellLineStylePopup : public svx::sidebar::Popup { -public : +public: CellLineStylePopup( vcl::Window* pParent, const ::boost::function<svx::sidebar::PopupControl*(svx::sidebar::PopupContainer*)>& rControlCreator); diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index e47183970039..6fc4e472a97b 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -112,7 +112,7 @@ typedef ::cppu::WeakImplHelper4< awt::XTopWindowListener, awt::XWindowListener, // This class is to process Workbook window related event class ScVbaEventListener : public ScVbaEventListener_BASE { -public : +public: ScVbaEventListener( ScVbaEventsHelper& rVbaEvents, const uno::Reference< frame::XModel >& rxModel, ScDocShell* pDocShell ); virtual ~ScVbaEventListener(); diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index 873ab5cbe7ff..9180464823dc 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -86,7 +86,7 @@ enum PageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3, LAYOUT = 4 }; class PropValue { - protected : + protected: ::com::sun::star::uno::Any mAny; @@ -97,7 +97,7 @@ class PropValue bool ImplGetPropertyValue( const ::com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > &, const OUString& ); - public : + public: PropValue() {} @@ -123,7 +123,7 @@ class PPTExBulletProvider { friend struct PPTExParaSheet; - protected : + protected: SvMemoryStream aBuExPictureStream; SvMemoryStream aBuExOutlineStream; @@ -131,7 +131,7 @@ class PPTExBulletProvider EscherGraphicProvider* pGraphicProv; - public : + public: sal_uInt16 GetId( const OString& rUniqueId, Size& rGraphicSize ); @@ -171,7 +171,7 @@ struct FontCollectionEntry }; ~FontCollectionEntry(); - private : + private: FontCollectionEntry() {} @@ -180,7 +180,7 @@ struct FontCollectionEntry class FontCollection { -public : +public: FontCollection(); @@ -306,7 +306,7 @@ struct PPTExParaSheet class PPTExStyleSheet { - public : + public: PPTExCharSheet* mpCharSheet[ PPTEX_STYLESHEETENTRYS ]; PPTExParaSheet* mpParaSheet[ PPTEX_STYLESHEETENTRYS ]; diff --git a/sd/source/filter/eppt/pptexsoundcollection.hxx b/sd/source/filter/eppt/pptexsoundcollection.hxx index 8bb5c52f4adc..693e17540c8b 100644 --- a/sd/source/filter/eppt/pptexsoundcollection.hxx +++ b/sd/source/filter/eppt/pptexsoundcollection.hxx @@ -39,7 +39,7 @@ class ExSoundEntry OUString ImplGetName() const; OUString ImplGetExtension() const; - public : + public: bool IsSameURL(const OUString& rURL) const; sal_uInt32 GetFileSize( ) const { return nFileSize; }; diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx index 45d575bea7e0..c321669fee80 100644 --- a/sd/source/filter/eppt/text.hxx +++ b/sd/source/filter/eppt/text.hxx @@ -119,7 +119,7 @@ class PortionObj : public PropStateValue friend class ParagraphObj; - protected : + protected: void ImplClear(); void ImplConstruct( const PortionObj& rPortionObj ); @@ -128,7 +128,7 @@ class PortionObj : public PropStateValue sal_uInt32 ImplCalculateTextPositions( sal_uInt32 nCurrentTextPosition ); void ImplGetPortionValues( FontCollection& rFontCollection, bool bGetPropStateValue = false ); - public : + public: ::com::sun::star::beans::PropertyState meCharColor; ::com::sun::star::beans::PropertyState meCharHeight; @@ -181,7 +181,7 @@ class ParagraphObj : public PropStateValue, public SOParagraph MapMode maMapModeSrc; MapMode maMapModeDest; - protected : + protected: void ImplConstruct( const ParagraphObj& rParagraphObj ); void ImplClear(); @@ -189,7 +189,7 @@ class ParagraphObj : public PropStateValue, public SOParagraph void ImplGetParagraphValues( PPTExBulletProvider* pBuProv, bool bGetPropStateValue = false ); void ImplGetNumberingLevel( PPTExBulletProvider* pBuProv, sal_Int16 nDepth, bool bIsBullet, bool bGetPropStateValue = false ); - public : + public: ::com::sun::star::uno::Sequence< ::com::sun::star::style::TabStop > maTabStop; @@ -247,7 +247,7 @@ class TextObj boost::shared_ptr<ImplTextObj> mpImplTextObj; void ImplCalculateTextPositions(); -public : +public: TextObj( ::com::sun::star::uno::Reference< ::com::sun::star::text::XSimpleText > & rXText, int nInstance, FontCollection& rFontCollection, PPTExBulletProvider& rBuProv ); diff --git a/sdext/source/minimizer/configurationaccess.hxx b/sdext/source/minimizer/configurationaccess.hxx index d8f6c01d8148..f313e712c06d 100644 --- a/sdext/source/minimizer/configurationaccess.hxx +++ b/sdext/source/minimizer/configurationaccess.hxx @@ -78,7 +78,7 @@ struct OptimizerSettings }; class ConfigurationAccess { - public : + public: ConfigurationAccess( const css::uno::Reference< css::uno::XComponentContext >& rXFactory, OptimizerSettings* pDefaultSettings = NULL ); @@ -101,7 +101,7 @@ class ConfigurationAccess std::vector< OptimizerSettings >& GetOptimizerSettings() { return maSettings; }; std::vector< OptimizerSettings >::iterator GetOptimizerSettingsByName( const OUString& rName ); - private : + private: struct Compare { diff --git a/sdext/source/minimizer/fileopendialog.hxx b/sdext/source/minimizer/fileopendialog.hxx index 0cc452c342c0..78f835f5913e 100644 --- a/sdext/source/minimizer/fileopendialog.hxx +++ b/sdext/source/minimizer/fileopendialog.hxx @@ -46,7 +46,7 @@ class FileOpenDialog std::vector< FilterEntry > aFilterEntryList; -public : +public: FileOpenDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); ~FileOpenDialog(); diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index 502d732e9478..beafc6561cab 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.hxx @@ -44,7 +44,7 @@ class InformationDialog : public UnoDialog, public ConfigurationAccess { -public : +public: InformationDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext, css::uno::Reference< css::frame::XFrame >& rxFrame, const OUString& rSaveAsURL, @@ -53,7 +53,7 @@ public : bool execute(); -private : +private: css::uno::Reference< css::frame::XFrame > mxFrame; css::uno::Reference< css::io::XStream > mxTempFile; diff --git a/sdext/source/minimizer/optimizationstats.hxx b/sdext/source/minimizer/optimizationstats.hxx index 6ecb237ca641..545f4fb78259 100644 --- a/sdext/source/minimizer/optimizationstats.hxx +++ b/sdext/source/minimizer/optimizationstats.hxx @@ -37,7 +37,7 @@ class OptimizationStats }; std::map < PPPOptimizerTokenEnum, css::uno::Any, Compare > maStats; - public : + public: OptimizationStats(); ~OptimizationStats(){}; diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index cfd280cceb18..e236b62c3dd2 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -58,7 +58,7 @@ class OptimizerDialog : public UnoDialog, public ConfigurationAccess { -public : +public: OptimizerDialog( const css::uno::Reference< css::uno::XComponentContext >& rxContext, css::uno::Reference< css::frame::XFrame >& rxFrame, css::uno::Reference< css::frame::XDispatch > rxStatusDispatcher ); @@ -70,7 +70,7 @@ public : sal_Int16 mnTabIndex; bool mbIsReadonly; -private : +private: css::uno::Reference< css::frame::XFrame > mxFrame; css::uno::Reference< css::uno::XInterface > mxRoadmapControl; @@ -104,7 +104,7 @@ private : void DeactivatePage( sal_Int16 nStep ); void InsertRoadmapItem( const sal_Int32 nIndex, const bool bEnabled, const OUString& rLabel, const sal_Int32 nItemID ); -public : +public: OptimizationStats maStats; diff --git a/sdext/source/minimizer/unodialog.hxx b/sdext/source/minimizer/unodialog.hxx index e0e58abdd41d..7f1e5cfc3d0a 100644 --- a/sdext/source/minimizer/unodialog.hxx +++ b/sdext/source/minimizer/unodialog.hxx @@ -60,7 +60,7 @@ class UnoDialog { -public : +public: UnoDialog( const css::uno::Reference< css::uno::XComponentContext >& rxMSF, css::uno::Reference< css::frame::XFrame >& rxFrame ); ~UnoDialog(); diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx index fb0dad6ff795..1ce7a4434c24 100644 --- a/sfx2/source/appl/linksrc.cxx +++ b/sfx2/source/appl/linksrc.cxx @@ -93,7 +93,7 @@ SvLinkSource_Entry_Impl::~SvLinkSource_Entry_Impl() class SvLinkSource_Array_Impl { -private : +private: std::vector<SvLinkSource_Entry_Impl*> mvData; public: diff --git a/shell/source/backends/localebe/localebackend.hxx b/shell/source/backends/localebe/localebackend.hxx index 29ca23c1d8bd..cd5822142c6f 100644 --- a/shell/source/backends/localebe/localebackend.hxx +++ b/shell/source/backends/localebe/localebackend.hxx @@ -33,7 +33,7 @@ class LocaleBackend : public ::cppu::WeakImplHelper2 < css::beans::XPropertySet, lang::XServiceInfo > { - public : + public: static LocaleBackend* createInstance(); diff --git a/shell/source/backends/wininetbe/wininetbackend.hxx b/shell/source/backends/wininetbe/wininetbackend.hxx index a2b87079da63..1b90140fd5c5 100644 --- a/shell/source/backends/wininetbe/wininetbackend.hxx +++ b/shell/source/backends/wininetbe/wininetbackend.hxx @@ -33,7 +33,7 @@ class WinInetBackend : public ::cppu::WeakImplHelper2 < css::beans::XPropertySet, lang::XServiceInfo > { - public : + public: static WinInetBackend* createInstance(); diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 952dfac9fe8c..e4f64a55e58c 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -180,7 +180,7 @@ class SmCmdBoxWindow : public SfxDockingWindow DECL_LINK_TYPED(InitialFocusTimerHdl, Timer *, void); -protected : +protected: // Window virtual void GetFocus() SAL_OVERRIDE; diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx index 8c59cccc451d..4cfc91312bd9 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.hxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx @@ -48,7 +48,7 @@ class EnhancedCustomShape3d const double* pMap; - public : + public: Transformation2D( const SdrObject* pCustomShape, const Rectangle& rBoundRect, const double* pMap ); @@ -59,10 +59,10 @@ class EnhancedCustomShape3d friend class Transformation2D; - protected : + protected: static Rectangle CalculateNewSnapRect( const SdrObject* pCustomShape, const Rectangle& rSnapRect, const Rectangle& rBoundRect, const double* pMap ); - public : + public: static SdrObject* Create3DObject( const SdrObject* pShape2d, const SdrObject* pCustomShape ); }; diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx index 68e13d4e6060..c190913abcd2 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.hxx @@ -27,7 +27,7 @@ class EnhancedCustomShapeFontWork { static ::com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > mxBreakIterator; - public : + public: static com::sun::star::uno::Reference < ::com::sun::star::i18n::XBreakIterator > GetBreakIterator(); static SdrObject* CreateFontWork( const SdrObject* pShape2d, const SdrObject* pCustomShape ); diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index 32d88f5d4f03..7108a59b75b4 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -844,7 +844,7 @@ class UnaryFunctionFunctor const ExpressionFunct meFunct; ParserContextSharedPtr mxContext; -public : +public: UnaryFunctionFunctor( const ExpressionFunct eFunct, const ParserContextSharedPtr& rContext ) : meFunct( eFunct ), @@ -916,7 +916,7 @@ class IfFunctor { ParserContextSharedPtr mxContext; -public : +public: explicit IfFunctor( const ParserContextSharedPtr& rContext ) : mxContext( rContext ) diff --git a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx index ebbd1987bc2e..b11cb8ce35d5 100644 --- a/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx +++ b/svx/source/sidebar/area/AreaTransparencyGradientPopup.hxx @@ -32,7 +32,7 @@ namespace svx { namespace sidebar { class AreaTransparencyGradientPopup : public Popup { -public : +public: AreaTransparencyGradientPopup ( vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); diff --git a/svx/source/sidebar/line/LineWidthPopup.hxx b/svx/source/sidebar/line/LineWidthPopup.hxx index 7a2fe7b5c8f4..772934fb07b3 100644 --- a/svx/source/sidebar/line/LineWidthPopup.hxx +++ b/svx/source/sidebar/line/LineWidthPopup.hxx @@ -31,7 +31,7 @@ namespace svx { namespace sidebar { class LineWidthPopup : public Popup { -public : +public: LineWidthPopup ( vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx index b93e4fc52b15..7cf5bcd5e21d 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.hxx @@ -28,7 +28,7 @@ namespace svx { namespace sidebar { class TextCharacterSpacingPopup : public Popup { -public : +public: TextCharacterSpacingPopup ( vcl::Window* pParent, const ::boost::function<VclPtr<PopupControl>(PopupContainer*)>& rControlCreator); diff --git a/svx/source/sidebar/text/TextUnderlinePopup.hxx b/svx/source/sidebar/text/TextUnderlinePopup.hxx index 0643d927abb0..6eea294cd977 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.hxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.hxx @@ -28,7 +28,7 @@ namespace svx { namespace sidebar { class TextUnderlinePopup : public Popup { -public : +public: TextUnderlinePopup ( vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator); diff --git a/vcl/source/filter/jpeg/Exif.hxx b/vcl/source/filter/jpeg/Exif.hxx index 459a36b9b6ec..2f440f6573c7 100644 --- a/vcl/source/filter/jpeg/Exif.hxx +++ b/vcl/source/filter/jpeg/Exif.hxx @@ -71,7 +71,7 @@ private: static Orientation convertToOrientation(sal_Int32 value); -public : +public: Exif(); virtual ~Exif(); diff --git a/vcl/source/filter/wmf/winmtf.hxx b/vcl/source/filter/wmf/winmtf.hxx index babad4ebbffd..b68b9acfb30d 100644 --- a/vcl/source/filter/wmf/winmtf.hxx +++ b/vcl/source/filter/wmf/winmtf.hxx @@ -241,7 +241,7 @@ class WinMtfClipPath { basegfx::tools::B2DClipState maClip; -public : +public: WinMtfClipPath(): maClip() {}; void setClipPath( const tools::PolyPolygon& rPolyPolygon, sal_Int32 nClippingMode ); diff --git a/writerperfect/source/common/WPXSvInputStream.cxx b/writerperfect/source/common/WPXSvInputStream.cxx index a5550fd4decb..180461a7345b 100644 --- a/writerperfect/source/common/WPXSvInputStream.cxx +++ b/writerperfect/source/common/WPXSvInputStream.cxx @@ -399,7 +399,7 @@ Reference<XInputStream> ZipStorageImpl::createStream(const rtl::OUString &rPath) class WPXSvInputStreamImpl { -public : +public: explicit WPXSvInputStreamImpl(::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > xStream); ~WPXSvInputStreamImpl(); diff --git a/xmloff/source/draw/ximpshap.hxx b/xmloff/source/draw/ximpshap.hxx index 0f5699e933dc..73c9d8c0e478 100644 --- a/xmloff/source/draw/ximpshap.hxx +++ b/xmloff/source/draw/ximpshap.hxx @@ -599,7 +599,7 @@ public: class SdXMLCustomShapeContext : public SdXMLShapeContext { -protected : +protected: OUString maCustomShapeEngine; OUString maCustomShapeData; diff --git a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx index 1900909a7a14..b76abcab09ae 100644 --- a/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlencryptiontemplateimpl.hxx @@ -38,13 +38,13 @@ class XMLEncryptionTemplateImpl : public ::cppu::WeakImplHelper2< ::com::sun::star::xml::crypto::XXMLEncryptionTemplate , ::com::sun::star::lang::XServiceInfo > { - private : + private: ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > m_xTemplate ; ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > m_xTarget ; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ; ::com::sun::star::xml::crypto::SecurityOperationStatus m_nStatus; - public : + public: explicit XMLEncryptionTemplateImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aFactory ) ; virtual ~XMLEncryptionTemplateImpl() ; diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx index 6d34bbabdc39..e6d395c247bb 100644 --- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx +++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.hxx @@ -39,14 +39,14 @@ class XMLSignatureTemplateImpl : public ::cppu::WeakImplHelper2< ::com::sun::star::xml::crypto::XXMLSignatureTemplate , ::com::sun::star::lang::XServiceInfo > { - private : + private: ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > m_xTemplate ; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ; std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::xml::wrapper::XXMLElementWrapper > > targets; ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XUriBinding > m_xUriBinding; ::com::sun::star::xml::crypto::SecurityOperationStatus m_nStatus; - public : + public: explicit XMLSignatureTemplateImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aFactory ) ; virtual ~XMLSignatureTemplateImpl() ; diff --git a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx index 1a93e95a5e6b..3e89ce56699e 100644 --- a/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx +++ b/xmlsecurity/source/xmlsec/certificateextension_xmlsecimpl.hxx @@ -31,12 +31,12 @@ class CertificateExtension_XmlSecImpl : public ::cppu::WeakImplHelper1< ::com::sun::star::security::XCertificateExtension > { - private : + private: bool m_critical ; ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnId ; ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnValue ; - public : + public: CertificateExtension_XmlSecImpl() ; virtual ~CertificateExtension_XmlSecImpl() ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx index 1de515950032..5abd5be88951 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/sanextension_mscryptimpl.hxx @@ -41,14 +41,14 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper1< ::com::sun::star::security::XSanExtension > { - private : + private: sal_Bool m_critical ; ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnId ; ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnValue ; ::com::sun::star::uno::Sequence< com::sun::star::security::CertAltNameEntry > m_Entries; - public : + public: SanExtensionImpl() ; virtual ~SanExtensionImpl() ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx index 8e153f59b077..95d6671c86de 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx @@ -55,7 +55,7 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XUnoTunnel > { - private : + private: //crypto provider and key container HCRYPTPROV m_hProv ; LPCTSTR m_pszContainer ; @@ -83,7 +83,7 @@ class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper3< //Service manager ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ; - public : + public: explicit SecurityEnvironment_MSCryptImpl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& aFactory ) ; virtual ~SecurityEnvironment_MSCryptImpl() ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx index d1f10fb812da..d136b8be33fa 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx @@ -41,10 +41,10 @@ class X509Certificate_MSCryptImpl : public ::cppu::WeakImplHelper2< ::com::sun::star::security::XCertificate , ::com::sun::star::lang::XUnoTunnel > { - private : + private: const CERT_CONTEXT* m_pCertContext ; - public : + public: X509Certificate_MSCryptImpl() ; virtual ~X509Certificate_MSCryptImpl() ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx index 0e634687e241..b36ead227849 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx @@ -38,10 +38,10 @@ class XMLEncryption_MSCryptImpl : public ::cppu::WeakImplHelper2< ::com::sun::star::xml::crypto::XXMLEncryption , ::com::sun::star::lang::XServiceInfo > { - private : + private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ; - public : + public: explicit XMLEncryption_MSCryptImpl(const css::uno::Reference<css::lang::XMultiServiceFactory>& rFactory); virtual ~XMLEncryption_MSCryptImpl() ; diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx index f306393fed8b..185787ad2f1d 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsecuritycontext_mscryptimpl.hxx @@ -39,11 +39,11 @@ class XMLSecurityContext_MSCryptImpl : public ::cppu::WeakImplHelper2< ::com::sun::star::xml::crypto::XXMLSecurityContext , ::com::sun::star::lang::XServiceInfo > { - private : + private: //xmlSecKeysMngrPtr m_pKeysMngr ; ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment ; - public : + public: XMLSecurityContext_MSCryptImpl(); virtual ~XMLSecurityContext_MSCryptImpl(); diff --git a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx index 7044ee2c6ed8..13b2c16a170a 100644 --- a/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx +++ b/xmlsecurity/source/xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx @@ -38,10 +38,10 @@ class XMLSignature_MSCryptImpl : public ::cppu::WeakImplHelper2< ::com::sun::star::xml::crypto::XXMLSignature , ::com::sun::star::lang::XServiceInfo > { - private : + private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ; - public : + public: explicit XMLSignature_MSCryptImpl(const css::uno::Reference<css::lang::XMultiServiceFactory >& rFactory); virtual ~XMLSignature_MSCryptImpl() ; diff --git a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx index 7ccfb6430d31..14a7d9336c8e 100644 --- a/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/sanextension_nssimpl.hxx @@ -33,7 +33,7 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper1< ::com::sun::star::security::XSanExtension > { - private : + private: bool m_critical ; ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnId ; ::com::sun::star::uno::Sequence< sal_Int8 > m_xExtnValue ; @@ -41,7 +41,7 @@ class SanExtensionImpl : public ::cppu::WeakImplHelper1< static OString removeOIDFromString( const OString &oid); - public : + public: SanExtensionImpl() ; virtual ~SanExtensionImpl() ; diff --git a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx index b35661b4c37e..cf48fb6ac108 100644 --- a/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/securityenvironment_nssimpl.hxx @@ -50,7 +50,7 @@ class SecurityEnvironment_NssImpl : public ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo, ::com::sun::star::lang::XUnoTunnel > { -private : +private: std::list< PK11SlotInfo* > m_Slots; typedef std::list< PK11SlotInfo* >::const_iterator CIT_SLOTS; @@ -63,7 +63,7 @@ private : std::list< SECKEYPrivateKey* > m_tPriKeyList ; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ; - public : + public: SecurityEnvironment_NssImpl(); virtual ~SecurityEnvironment_NssImpl(); diff --git a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx index fb444e705472..bf400739861d 100644 --- a/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx @@ -35,10 +35,10 @@ class X509Certificate_NssImpl : public ::cppu::WeakImplHelper2< ::com::sun::star::security::XCertificate , ::com::sun::star::lang::XUnoTunnel > { - private : + private: CERTCertificate* m_pCert ; - public : + public: X509Certificate_NssImpl() ; virtual ~X509Certificate_NssImpl() ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx index dd7df15c0ffa..14b7aaf7b9f7 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlencryption_nssimpl.hxx @@ -38,10 +38,10 @@ class XMLEncryption_NssImpl : public ::cppu::WeakImplHelper2< ::com::sun::star::xml::crypto::XXMLEncryption , ::com::sun::star::lang::XServiceInfo > { - private : + private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ; - public : + public: explicit XMLEncryption_NssImpl(const css::uno::Reference<css::lang::XMultiServiceFactory >& rFactory); virtual ~XMLEncryption_NssImpl() ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx index d85cfbdaa339..59a39b845c04 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsecuritycontext_nssimpl.hxx @@ -40,14 +40,14 @@ class XMLSecurityContext_NssImpl : public ::cppu::WeakImplHelper2< ::com::sun::star::xml::crypto::XXMLSecurityContext , ::com::sun::star::lang::XServiceInfo > { - private : + private: //xmlSecKeysMngrPtr m_pKeysMngr ; //::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > m_xSecurityEnvironment ; std::vector< ::com::sun::star::uno::Reference< ::com::sun::star::xml::crypto::XSecurityEnvironment > > m_vSecurityEnvironments; sal_Int32 m_nDefaultEnvIndex; - public : + public: XMLSecurityContext_NssImpl() ; virtual ~XMLSecurityContext_NssImpl() ; diff --git a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx index c2ed1225d8c9..908da34e350e 100644 --- a/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx +++ b/xmlsecurity/source/xmlsec/nss/xmlsignature_nssimpl.hxx @@ -38,10 +38,10 @@ class XMLSignature_NssImpl : public ::cppu::WeakImplHelper2< ::com::sun::star::xml::crypto::XXMLSignature , ::com::sun::star::lang::XServiceInfo > { - private : + private: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager ; - public : + public: explicit XMLSignature_NssImpl(const css::uno::Reference<css::lang::XMultiServiceFactory>& rFactory); virtual ~XMLSignature_NssImpl() ; diff --git a/xmlsecurity/source/xmlsec/saxhelper.hxx b/xmlsecurity/source/xmlsec/saxhelper.hxx index bdd2099125da..b4523a43b2ab 100644 --- a/xmlsecurity/source/xmlsec/saxhelper.hxx +++ b/xmlsecurity/source/xmlsec/saxhelper.hxx @@ -33,7 +33,7 @@ */ class SAXHelper { - private : + private: xmlParserCtxtPtr m_pParserCtxt ; xmlSAXHandlerPtr m_pSaxHandler ; |