summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-08-16 09:32:45 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-08-16 11:19:21 +0200
commit0b021f89f60208877427eaf004e25db8be3832f6 (patch)
tree0eec9e17fbdbf1d99ee1ab258cea829c8218f861 /include
parente5d9b5ffc423cbb314cde1f66f7bebf4db30b1e6 (diff)
rename some unnecessary contractions, Lft-Left, etc.
Change-Id: Idf4ab2d4d2550a02c0c50a981d94c67b111082a9 Reviewed-on: https://gerrit.libreoffice.org/41204 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/svx/sdtditm.hxx16
-rw-r--r--include/svx/sdtmfitm.hxx16
-rw-r--r--include/svx/svdpage.hxx34
3 files changed, 33 insertions, 33 deletions
diff --git a/include/svx/sdtditm.hxx b/include/svx/sdtditm.hxx
index ed57c860da98..9e363c7627e6 100644
--- a/include/svx/sdtditm.hxx
+++ b/include/svx/sdtditm.hxx
@@ -22,20 +22,20 @@
#include <svx/sdmetitm.hxx>
#include <svx/svddef.hxx>
-inline SdrMetricItem makeSdrTextLeftDistItem(long nHgt) {
- return SdrMetricItem(SDRATTR_TEXT_LEFTDIST, nHgt);
+inline SdrMetricItem makeSdrTextLeftDistItem(long mnHeight) {
+ return SdrMetricItem(SDRATTR_TEXT_LEFTDIST, mnHeight);
}
-inline SdrMetricItem makeSdrTextRightDistItem(long nHgt) {
- return SdrMetricItem(SDRATTR_TEXT_RIGHTDIST, nHgt);
+inline SdrMetricItem makeSdrTextRightDistItem(long mnHeight) {
+ return SdrMetricItem(SDRATTR_TEXT_RIGHTDIST, mnHeight);
}
-inline SdrMetricItem makeSdrTextUpperDistItem(long nHgt) {
- return SdrMetricItem(SDRATTR_TEXT_UPPERDIST, nHgt);
+inline SdrMetricItem makeSdrTextUpperDistItem(long mnHeight) {
+ return SdrMetricItem(SDRATTR_TEXT_UPPERDIST, mnHeight);
}
-inline SdrMetricItem makeSdrTextLowerDistItem(long nHgt) {
- return SdrMetricItem(SDRATTR_TEXT_LOWERDIST, nHgt);
+inline SdrMetricItem makeSdrTextLowerDistItem(long mnHeight) {
+ return SdrMetricItem(SDRATTR_TEXT_LOWERDIST, mnHeight);
}
#endif
diff --git a/include/svx/sdtmfitm.hxx b/include/svx/sdtmfitm.hxx
index a590dde77d7e..838d938c3336 100644
--- a/include/svx/sdtmfitm.hxx
+++ b/include/svx/sdtmfitm.hxx
@@ -22,20 +22,20 @@
#include <svx/sdmetitm.hxx>
#include <svx/svddef.hxx>
-inline SdrMetricItem makeSdrTextMinFrameHeightItem(long nHgt) {
- return SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT, nHgt);
+inline SdrMetricItem makeSdrTextMinFrameHeightItem(long mnHeight) {
+ return SdrMetricItem(SDRATTR_TEXT_MINFRAMEHEIGHT, mnHeight);
}
-inline SdrMetricItem makeSdrTextMaxFrameHeightItem(long nHgt) {
- return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT, nHgt);
+inline SdrMetricItem makeSdrTextMaxFrameHeightItem(long mnHeight) {
+ return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEHEIGHT, mnHeight);
}
-inline SdrMetricItem makeSdrTextMinFrameWidthItem(long nWdt) {
- return SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH, nWdt);
+inline SdrMetricItem makeSdrTextMinFrameWidthItem(long mnWidth) {
+ return SdrMetricItem(SDRATTR_TEXT_MINFRAMEWIDTH, mnWidth);
};
-inline SdrMetricItem makeSdrTextMaxFrameWidthItem(long nWdt) {
- return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEWIDTH, nWdt);
+inline SdrMetricItem makeSdrTextMaxFrameWidthItem(long mnWidth) {
+ return SdrMetricItem(SDRATTR_TEXT_MAXFRAMEWIDTH, mnWidth);
}
#endif
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index 696205e1ef6e..54b8a6ede4d9 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -385,12 +385,12 @@ public:
void ActionChanged();
private:
- sal_Int32 nWdt; // Seitengroesse
- sal_Int32 nHgt; // Seitengroesse
- sal_Int32 nBordLft; // Seitenrand links
- sal_Int32 nBordUpp; // Seitenrand oben
- sal_Int32 nBordRgt; // Seitenrand rechts
- sal_Int32 nBordLwr; // Seitenrand unten
+ sal_Int32 mnWidth; // Seitengroesse
+ sal_Int32 mnHeight; // Seitengroesse
+ sal_Int32 mnBorderLeft; // Seitenrand links
+ sal_Int32 mnBorderUpper; // Seitenrand oben
+ sal_Int32 mnBorderRight; // Seitenrand rechts
+ sal_Int32 mnBorderLower; // Seitenrand unten
std::unique_ptr<SdrLayerAdmin> mpLayerAdmin;
std::unique_ptr<SdrPageProperties> mpSdrPageProperties;
@@ -405,7 +405,7 @@ protected:
// new MasterPageDescriptorVector
sdr::MasterPageDescriptor* mpMasterPageDescriptor;
- SdrLayerIDSet aPrefVisiLayers;
+ SdrLayerIDSet aPrefVisiLayers;
sal_uInt16 nPageNum;
bool mbMaster : 1; // flag if this is a MasterPage
@@ -450,17 +450,17 @@ public:
Size GetSize() const;
virtual void SetOrientation(Orientation eOri);
virtual Orientation GetOrientation() const;
- sal_Int32 GetWdt() const;
- sal_Int32 GetHgt() const;
+ sal_Int32 GetWidth() const;
+ sal_Int32 GetHeight() const;
virtual void SetBorder(sal_Int32 nLft, sal_Int32 nUpp, sal_Int32 nRgt, sal_Int32 Lwr);
- virtual void SetLftBorder(sal_Int32 nBorder);
- virtual void SetUppBorder(sal_Int32 nBorder);
- virtual void SetRgtBorder(sal_Int32 nBorder);
- virtual void SetLwrBorder(sal_Int32 nBorder);
- sal_Int32 GetLftBorder() const;
- sal_Int32 GetUppBorder() const;
- sal_Int32 GetRgtBorder() const;
- sal_Int32 GetLwrBorder() const;
+ virtual void SetLeftBorder(sal_Int32 nBorder);
+ virtual void SetUpperBorder(sal_Int32 nBorder);
+ virtual void SetRightBorder(sal_Int32 nBorder);
+ virtual void SetLowerBorder(sal_Int32 nBorder);
+ sal_Int32 GetLeftBorder() const;
+ sal_Int32 GetUpperBorder() const;
+ sal_Int32 GetRightBorder() const;
+ sal_Int32 GetLowerBorder() const;
virtual void SetModel(SdrModel* pNewModel) override;