Author: mseidel
Date: Wed Jul 11 21:33:04 2018
New Revision: 1835675
URL: http://svn.apache.org/viewvc?rev=1835675&view=rev
Log:
Minor cleanup
Modified:
openoffice/trunk/main/i18npool/inc/i18npool/paper.hxx
Modified: openoffice/trunk/main/i18npool/inc/i18npool/paper.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/i18npool/inc/i18npool/paper.hxx?rev=1835675&r1=1835674&r2=1835675&view=diff
==============================================================================
--- openoffice/trunk/main/i18npool/inc/i18npool/paper.hxx (original)
+++ openoffice/trunk/main/i18npool/inc/i18npool/paper.hxx Wed Jul 11 21:33:04
2018
@@ -30,94 +30,94 @@
#include <rtl/string.hxx>
#include <com/sun/star/lang/Locale.hpp>
-//!! WARNING: be aware of cui/source/tabpages/page.h where someone had the
broken idea
+//!! WARNING: be aware of cui/source/tabpages/page.h where someone had the
broken idea
//!! of duplicating the values of this enum in order to use those defines
within
-//!! src files.
+//!! src files.
//!! Thus don't reorder the enum values here without changing the code there
as well.
enum Paper
{
- PAPER_A0,
- PAPER_A1,
- PAPER_A2,
- PAPER_A3,
- PAPER_A4,
- PAPER_A5,
- PAPER_B4_ISO,
- PAPER_B5_ISO,
- PAPER_LETTER,
- PAPER_LEGAL,
- PAPER_TABLOID,
- PAPER_USER,
- PAPER_B6_ISO,
- PAPER_ENV_C4,
- PAPER_ENV_C5,
- PAPER_ENV_C6,
- PAPER_ENV_C65,
- PAPER_ENV_DL,
- PAPER_SLIDE_DIA,
- PAPER_SCREEN,
- PAPER_C,
- PAPER_D,
- PAPER_E,
- PAPER_EXECUTIVE,
- PAPER_FANFOLD_LEGAL_DE,
- PAPER_ENV_MONARCH,
- PAPER_ENV_PERSONAL,
- PAPER_ENV_9,
- PAPER_ENV_10,
- PAPER_ENV_11,
- PAPER_ENV_12,
- PAPER_KAI16,
- PAPER_KAI32,
- PAPER_KAI32BIG,
- PAPER_B4_JIS,
- PAPER_B5_JIS,
- PAPER_B6_JIS,
- PAPER_LEDGER,
- PAPER_STATEMENT,
- PAPER_QUARTO,
- PAPER_10x14,
- PAPER_ENV_14,
- PAPER_ENV_C3,
- PAPER_ENV_ITALY,
- PAPER_FANFOLD_US,
- PAPER_FANFOLD_DE,
- PAPER_POSTCARD_JP,
- PAPER_9x11,
- PAPER_10x11,
- PAPER_15x11,
- PAPER_ENV_INVITE,
- PAPER_A_PLUS,
- PAPER_B_PLUS,
- PAPER_LETTER_PLUS,
- PAPER_A4_PLUS,
- PAPER_DOUBLEPOSTCARD_JP,
- PAPER_A6,
- PAPER_12x11,
- PAPER_A7,
- PAPER_A8,
- PAPER_A9,
- PAPER_A10,
- PAPER_B0_ISO,
- PAPER_B1_ISO,
- PAPER_B2_ISO,
- PAPER_B3_ISO,
- PAPER_B7_ISO,
- PAPER_B8_ISO,
- PAPER_B9_ISO,
- PAPER_B10_ISO,
- PAPER_ENV_C2,
- PAPER_ENV_C7,
- PAPER_ENV_C8,
- PAPER_ARCHA,
- PAPER_ARCHB,
- PAPER_ARCHC,
- PAPER_ARCHD,
- PAPER_ARCHE
+ PAPER_A0,
+ PAPER_A1,
+ PAPER_A2,
+ PAPER_A3,
+ PAPER_A4,
+ PAPER_A5,
+ PAPER_B4_ISO,
+ PAPER_B5_ISO,
+ PAPER_LETTER,
+ PAPER_LEGAL,
+ PAPER_TABLOID,
+ PAPER_USER,
+ PAPER_B6_ISO,
+ PAPER_ENV_C4,
+ PAPER_ENV_C5,
+ PAPER_ENV_C6,
+ PAPER_ENV_C65,
+ PAPER_ENV_DL,
+ PAPER_SLIDE_DIA,
+ PAPER_SCREEN,
+ PAPER_C,
+ PAPER_D,
+ PAPER_E,
+ PAPER_EXECUTIVE,
+ PAPER_FANFOLD_LEGAL_DE,
+ PAPER_ENV_MONARCH,
+ PAPER_ENV_PERSONAL,
+ PAPER_ENV_9,
+ PAPER_ENV_10,
+ PAPER_ENV_11,
+ PAPER_ENV_12,
+ PAPER_KAI16,
+ PAPER_KAI32,
+ PAPER_KAI32BIG,
+ PAPER_B4_JIS,
+ PAPER_B5_JIS,
+ PAPER_B6_JIS,
+ PAPER_LEDGER,
+ PAPER_STATEMENT,
+ PAPER_QUARTO,
+ PAPER_10x14,
+ PAPER_ENV_14,
+ PAPER_ENV_C3,
+ PAPER_ENV_ITALY,
+ PAPER_FANFOLD_US,
+ PAPER_FANFOLD_DE,
+ PAPER_POSTCARD_JP,
+ PAPER_9x11,
+ PAPER_10x11,
+ PAPER_15x11,
+ PAPER_ENV_INVITE,
+ PAPER_A_PLUS,
+ PAPER_B_PLUS,
+ PAPER_LETTER_PLUS,
+ PAPER_A4_PLUS,
+ PAPER_DOUBLEPOSTCARD_JP,
+ PAPER_A6,
+ PAPER_12x11,
+ PAPER_A7,
+ PAPER_A8,
+ PAPER_A9,
+ PAPER_A10,
+ PAPER_B0_ISO,
+ PAPER_B1_ISO,
+ PAPER_B2_ISO,
+ PAPER_B3_ISO,
+ PAPER_B7_ISO,
+ PAPER_B8_ISO,
+ PAPER_B9_ISO,
+ PAPER_B10_ISO,
+ PAPER_ENV_C2,
+ PAPER_ENV_C7,
+ PAPER_ENV_C8,
+ PAPER_ARCHA,
+ PAPER_ARCHB,
+ PAPER_ARCHC,
+ PAPER_ARCHD,
+ PAPER_ARCHE
};
// defined for 'equal size' test with the implementation array
-#define NUM_PAPER_ENTRIES (PAPER_ARCHE - PAPER_A0 + 1)
+#define NUM_PAPER_ENTRIES (PAPER_ARCHE - PAPER_A0 + 1)
// ---------
// - Paper -
@@ -125,26 +125,26 @@ enum Paper
class I18NPOOL_DLLPUBLIC PaperInfo
{
- Paper m_eType;
- long m_nPaperWidth; // width in 100thMM
- long m_nPaperHeight; // height in 100thMM
+ Paper m_eType;
+ long m_nPaperWidth; // width in 100thMM
+ long m_nPaperHeight; // height in 100thMM
public:
- PaperInfo(Paper eType);
- PaperInfo(long nPaperWidth, long nPaperHeight);
+ PaperInfo(Paper eType);
+ PaperInfo(long nPaperWidth, long nPaperHeight);
- Paper getPaper() const { return m_eType; }
- long getWidth() const { return m_nPaperWidth; }
- long getHeight() const { return m_nPaperHeight; }
- bool sloppyEqual(const PaperInfo &rOther) const;
- bool doSloppyFit();
+ Paper getPaper() const { return m_eType; }
+ long getWidth() const { return m_nPaperWidth; }
+ long getHeight() const { return m_nPaperHeight; }
+ bool sloppyEqual(const PaperInfo &rOther) const;
+ bool doSloppyFit();
- static PaperInfo getSystemDefaultPaper();
- static PaperInfo getDefaultPaperForLocale(const
::com::sun::star::lang::Locale & rLocale);
+ static PaperInfo getSystemDefaultPaper();
+ static PaperInfo getDefaultPaperForLocale(const
::com::sun::star::lang::Locale & rLocale);
- static Paper fromPSName(const rtl::OString &rName);
- static rtl::OString toPSName(Paper eType);
+ static Paper fromPSName(const rtl::OString &rName);
+ static rtl::OString toPSName(Paper eType);
- static long sloppyFitPageDimension(long nDimension);
+ static long sloppyFitPageDimension(long nDimension);
};
#endif // INCLUDED_I18NPOOL_PAPER_HXX
