diff options
author | Alexander Wilms <f.alexander.wilms@gmail.com> | 2014-02-25 19:06:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-03-01 09:51:32 -0600 |
commit | 8792ec7b2129650777b7b4bfacaa7c13d923279b (patch) | |
tree | f181e37b61533b460397cc68625fd21f46bb6393 /include/filter | |
parent | dff29fadfe418421f2af9fd4f1dccc8a9b4cd545 (diff) |
Remove visual noise from include
Conflicts:
include/framework/preventduplicateinteraction.hxx
include/sfx2/sfxbasecontroller.hxx
include/sfx2/sfxbasemodel.hxx
include/toolkit/awt/vclxtabpagemodel.hxx
include/vcl/field.hxx
include/vcl/settings.hxx
Change-Id: Ibccf9f88c68267a3d7e656012b51eaf644c418c2
Reviewed-on: https://gerrit.libreoffice.org/8272
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/filter')
-rw-r--r-- | include/filter/msfilter/countryid.hxx | 8 | ||||
-rw-r--r-- | include/filter/msfilter/escherex.hxx | 30 | ||||
-rw-r--r-- | include/filter/msfilter/mscodec.hxx | 6 | ||||
-rw-r--r-- | include/filter/msfilter/msvbahelper.hxx | 6 | ||||
-rw-r--r-- | include/filter/msfilter/svdfppt.hxx | 8 |
5 files changed, 29 insertions, 29 deletions
diff --git a/include/filter/msfilter/countryid.hxx b/include/filter/msfilter/countryid.hxx index fcf19ff43aa9..3af2803b0e18 100644 --- a/include/filter/msfilter/countryid.hxx +++ b/include/filter/msfilter/countryid.hxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -// ============================================================================ + #ifndef INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX #define INCLUDED_FILTER_MSFILTER_COUNTRYID_HXX @@ -26,7 +26,7 @@ #include <i18nlangtag/lang.h> #include <filter/msfilter/msfilterdllapi.h> -// ---------------------------------------------------------------------------- + namespace msfilter { @@ -300,11 +300,11 @@ MSFILTER_DLLPUBLIC CountryId ConvertLanguageToCountry( LanguageType eLanguage ); */ MSFILTER_DLLPUBLIC LanguageType ConvertCountryToLanguage( CountryId eCountry ); -// ============================================================================ + } // namespace svx -// ============================================================================ + #endif diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 70a017ae0759..a97dd87015bd 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -344,7 +344,7 @@ enum ESCHER_wMode }; -// + enum ESCHER_ShapePath { ESCHER_ShapeLines, // A line of straight segments @@ -364,7 +364,7 @@ enum ESCHER_WrapMode ESCHER_WrapThrough }; -// + enum ESCHER_bwMode { ESCHER_bwColor, // only used for predefined shades @@ -486,7 +486,7 @@ enum ESCHER_BlipFlags ESCHER_BlipFlagLinkToFile = 8 }; -// + enum ESCHER_3DRenderMode { ESCHER_FullRender, // Generate a full rendering @@ -494,7 +494,7 @@ enum ESCHER_3DRenderMode ESCHER_BoundingCube // Generate a bounding cube }; -// + enum ESCHER_xFormType { ESCHER_xFormAbsolute, // Apply transform in absolute space centered on shape @@ -502,7 +502,7 @@ enum ESCHER_xFormType ESCHER_xFormDrawing // Apply transform in drawing space }; -// + enum ESCHER_ShadowType { ESCHER_ShadowOffset, // N pixel offset shadow @@ -942,7 +942,7 @@ enum ESCHER_LineCap const sal_uInt32 DFF_DGG_CLUSTER_SIZE = 0x00000400; /// Shape IDs per cluster in DGG atom. -// --------------------------------------------------------------------------------------------- + namespace com { namespace sun { namespace star { namespace awt { @@ -1012,7 +1012,7 @@ struct EscherPropertyValueHelper ); }; -// --------------------------------------------------------------------------------------------- + struct EscherPersistEntry { @@ -1023,7 +1023,7 @@ struct EscherPersistEntry }; -// --------------------------------------------------------------------------------------------- + class EscherBlibEntry { @@ -1065,7 +1065,7 @@ public: sal_Bool operator==( const EscherBlibEntry& ) const; }; -// --------------------------------------------------------------------------------------------- + #define _E_GRAPH_PROV_USE_INSTANCES 1 #define _E_GRAPH_PROV_DO_NOT_ROTATE_METAFILES 2 @@ -1146,7 +1146,7 @@ public: ~EscherSolverContainer(); }; -// --------------------------------------------------------------------------------------------- + #define ESCHER_CREATEPOLYGON_LINE 1 #define ESCHER_CREATEPOLYGON_POLYLINE 2 @@ -1359,7 +1359,7 @@ public: static sal_Bool GetAdjustmentValue( const com::sun::star::drawing::EnhancedCustomShapeAdjustmentValue & rkProp, sal_Int32 nIndex, sal_Int32 nAdjustmentsWhichNeedsToBeConverted, sal_Int32& nValue ); }; -// --------------------------------------------------------------------------------------------- + typedef ::std::vector< EscherPersistEntry* > EscherPersistTable_impl; @@ -1381,7 +1381,7 @@ public: virtual ~EscherPersistTable(); }; -// --------------------------------------------------------------------------------------------- + class EscherEx; @@ -1477,7 +1477,7 @@ public: }; -// ============================================================================ + /** Instance for global DFF data, shared through various instances of EscherEx. */ class MSFILTER_DLLPUBLIC EscherExGlobal : public EscherGraphicProvider @@ -1559,7 +1559,7 @@ private: typedef ::boost::shared_ptr< EscherExGlobal > EscherExGlobalRef; -// --------------------------------------------------------------------------------------------- + class SdrObject; class SdrPage; @@ -1650,7 +1650,7 @@ public: sal_uLong GetStreamPos() const { return mpOutStrm->Tell(); } // features during the creation of the following Containers: - // + // ESCHER_DggContainer: a EscherDgg Atom is automatically being created and managed // ESCHER_DgContainer: a EscherDg Atom is automatically being created and managed // ESCHER_SpgrContainer: diff --git a/include/filter/msfilter/mscodec.hxx b/include/filter/msfilter/mscodec.hxx index d7d5e65447ce..12da3b787be5 100644 --- a/include/filter/msfilter/mscodec.hxx +++ b/include/filter/msfilter/mscodec.hxx @@ -29,7 +29,7 @@ namespace msfilter { -// ============================================================================ + /** Encodes and decodes data from protected MSO 95- documents. */ @@ -173,7 +173,7 @@ public: }; -// ============================================================================ + /** Encodes and decodes data from protected MSO 97+ documents. @@ -361,7 +361,7 @@ private: sal_uInt8 m_pDocId[16]; }; -// ============================================================================ + } // namespace msfilter diff --git a/include/filter/msfilter/msvbahelper.hxx b/include/filter/msfilter/msvbahelper.hxx index be1c85d70d2a..5afa6fe5f8d4 100644 --- a/include/filter/msfilter/msvbahelper.hxx +++ b/include/filter/msfilter/msvbahelper.hxx @@ -30,7 +30,7 @@ namespace ooo { namespace vba { -// ============================================================================ + struct MSFILTER_DLLPUBLIC MacroResolvedInfo { @@ -49,7 +49,7 @@ MSFILTER_DLLPUBLIC MacroResolvedInfo resolveVBAMacro( SfxObjectShell* pShell, co MSFILTER_DLLPUBLIC sal_Bool executeMacro( SfxObjectShell* pShell, const OUString& sMacroName, com::sun::star::uno::Sequence< com::sun::star::uno::Any >& aArgs, com::sun::star::uno::Any& aRet, const com::sun::star::uno::Any& aCaller ); MSFILTER_DLLPUBLIC ::com::sun::star::awt::KeyEvent parseKeyEvent( const OUString& sKey ) throw (::com::sun::star::uno::RuntimeException); MSFILTER_DLLPUBLIC void applyShortCutKeyBinding ( const ::com::sun::star::uno::Reference< com::sun::star::frame::XModel >& rxDoc, const ::com::sun::star::awt::KeyEvent& rKeyEvent, const OUString& sMacro ) throw (::com::sun::star::uno::RuntimeException); -// ============================================================================ + typedef ::cppu::WeakImplHelper3< ::com::sun::star::lang::XServiceInfo, @@ -96,7 +96,7 @@ private: OUString maProjectName; }; -// ============================================================================ + } // namespace vba } // namespace ooo diff --git a/include/filter/msfilter/svdfppt.hxx b/include/filter/msfilter/svdfppt.hxx index 10a13b1cbd39..e3762d93ed42 100644 --- a/include/filter/msfilter/svdfppt.hxx +++ b/include/filter/msfilter/svdfppt.hxx @@ -127,11 +127,11 @@ public: enum PptPageKind { PPT_MASTERPAGE, PPT_SLIDEPAGE, PPT_NOTEPAGE }; enum PptPageFormat -{ PPTPF_SCREEN, // +{ PPTPF_SCREEN, PPTPF_USLETTER, // 8.5x11" PPTPF_A4, // 210x297mm PPTPF_35MMDIA, // DIA - PPTPF_OVERHEAD, // + PPTPF_OVERHEAD, PPTPF_CUSTOM }; @@ -446,7 +446,7 @@ public: void ImportHeaderFooterContainer( DffRecordHeader& rHeader, HeaderFooterEntry& rEntry ); }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + #define SD_HEADERFOOTER_DATE 1 #define SD_HEADERFOOTER_TODAYDATE 2 @@ -508,7 +508,7 @@ struct ProcessData ~ProcessData() { delete[] pTableRowProperties; }; }; -//////////////////////////////////////////////////////////////////////////////////////////////////// + typedef ::std::vector< SdHyperlinkEntry* > SdHyperlinkEntryList; class SdrTextObj; |