summaryrefslogtreecommitdiff
path: root/sw/source/ui/envelp/labimg.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/envelp/labimg.cxx')
-rw-r--r--sw/source/ui/envelp/labimg.cxx218
1 files changed, 119 insertions, 99 deletions
diff --git a/sw/source/ui/envelp/labimg.cxx b/sw/source/ui/envelp/labimg.cxx
index 64d6f8c6adb4..e6c1d65bdf91 100644
--- a/sw/source/ui/envelp/labimg.cxx
+++ b/sw/source/ui/envelp/labimg.cxx
@@ -55,12 +55,16 @@ SwLabItem::SwLabItem() :
nCol (1),
nRow (1)
{
- bAddr = bCont = bSynchron = sal_False;
- bPage = sal_True;
- lHDist =
- lVDist =
- lWidth =
- lHeight = 5669; // 10 cm
+ bAddr =
+ bCont =
+ bSynchron = sal_False;
+ bPage = sal_True;
+ lHDist =
+ lVDist =
+ lWidth =
+ lHeight =
+ lPWidth =
+ lPHeight = 5669; // 10 cm
}
SwLabItem::SwLabItem(const SwLabItem& rItem) :
@@ -92,6 +96,8 @@ SwLabItem& SwLabItem::operator =(const SwLabItem& rItem)
lUpper = rItem.lUpper;
nCols = rItem.nCols;
nRows = rItem.nRows;
+ lPWidth = rItem.lPWidth;
+ lPHeight = rItem.lPHeight;
aPrivFirstName = rItem.aPrivFirstName;
aPrivName = rItem.aPrivName;
aPrivShortCut = rItem.aPrivShortCut;
@@ -148,6 +154,8 @@ int SwLabItem::operator ==(const SfxPoolItem& rItem) const
lUpper == rLab.lUpper &&
nCols == rLab.nCols &&
nRows == rLab.nRows &&
+ lPWidth == rLab.lPWidth &&
+ lPHeight == rLab.lPHeight&&
aWriting == rLab.aWriting&&
aMake == rLab.aMake &&
aType == rLab.aType &&
@@ -210,13 +218,15 @@ Sequence<rtl::OUString> SwLabCfgItem::GetPropertyNames()
"Format/Height", // 8
"Format/LeftMargin", // 9
"Format/TopMargin", //10
- "Option/Synchronize", //11
- "Option/Page", //12
- "Option/Column", //13
- "Option/Row", //14
- "Inscription/UseAddress", //15
- "Inscription/Address", //16
- "Inscription/Database" //17
+ "Format/PageWidth", //11
+ "Format/PageHeight", //12
+ "Option/Synchronize", //13
+ "Option/Page", //14
+ "Option/Column", //15
+ "Option/Row", //16
+ "Inscription/UseAddress", //17
+ "Inscription/Address", //18
+ "Inscription/Database" //19
};
static const char* aBusinessPropNames[] =
{
@@ -256,7 +266,7 @@ Sequence<rtl::OUString> SwLabCfgItem::GetPropertyNames()
"AutoText/Block" // 33
};
const int nBusinessCount = bIsLabel ? 0 : 34;
- const int nLabelCount = bIsLabel ? 18 : 15;
+ const int nLabelCount = bIsLabel ? 20 : 17;
Sequence<OUString> aNames(nBusinessCount + nLabelCount);
OUString* pNames = aNames.getArray();
int nIndex = 0;
@@ -285,9 +295,9 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) :
if(pValues[nProp].hasValue())
{
//to have a contiuous switch an offset is added
- if(nProp == 15 && !bIsLabel)
+ if(nProp == 17 && !bIsLabel)
nProperty += 3;
- if(nProperty >= 18)
+ if(nProperty >= 20)
bNoConfigValues = sal_False;
switch(nProperty)
{
@@ -320,47 +330,55 @@ SwLabCfgItem::SwLabCfgItem(sal_Bool bLabel) :
pValues[nProp] >>= aItem.lUpper;
aItem.lUpper = MM100_TO_TWIP(aItem.lUpper);
break;// "Format/TopMargin",
- case 11: aItem.bSynchron = *(sal_Bool*)pValues[nProp].getValue(); break;// "Option/Synchronize",
- case 12: aItem.bPage = *(sal_Bool*)pValues[nProp].getValue(); break;// "Option/Page",
- case 13: pValues[nProp] >>= aItem.nCol; break;// "Option/Column",
- case 14: pValues[nProp] >>= aItem.nRow; break;// "Option/Row"
- case 15: aItem.bAddr = *(sal_Bool*)pValues[nProp].getValue(); break;// "Inscription/UseAddress",
- case 16: pValues[nProp] >>= aItem.aWriting; break;// "Inscription/Address",
- case 17: pValues[nProp] >>= aItem.sDBName; break;// "Inscription/Database"
- case 18: pValues[nProp] >>= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName",
- case 19: pValues[nProp] >>= aItem.aPrivName; break;// "PrivateAddress/Name",
- case 20: pValues[nProp] >>= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut",
- case 21: pValues[nProp] >>= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName",
- case 22: pValues[nProp] >>= aItem.aPrivName2; break;// "PrivateAddress/SecondName",
- case 23: pValues[nProp] >>= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut",
- case 24: pValues[nProp] >>= aItem.aPrivStreet; break;// "PrivateAddress/Street",
- case 25: pValues[nProp] >>= aItem.aPrivZip; break;// "PrivateAddress/Zip",
- case 26: pValues[nProp] >>= aItem.aPrivCity; break;// "PrivateAddress/City",
- case 27: pValues[nProp] >>= aItem.aPrivCountry; break;// "PrivateAddress/Country",
- case 28: pValues[nProp] >>= aItem.aPrivState; break;// "PrivateAddress/State",
- case 29: pValues[nProp] >>= aItem.aPrivTitle; break;// "PrivateAddress/Title",
- case 30: pValues[nProp] >>= aItem.aPrivProfession; break;// "PrivateAddress/Profession",
- case 31: pValues[nProp] >>= aItem.aPrivPhone; break;// "PrivateAddress/Phone",
- case 32: pValues[nProp] >>= aItem.aPrivMobile; break;// "PrivateAddress/Mobile",
- case 33: pValues[nProp] >>= aItem.aPrivFax; break;// "PrivateAddress/Fax",
- case 34: pValues[nProp] >>= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress",
- case 35: pValues[nProp] >>= aItem.aPrivMail; break;// "PrivateAddress/Email",
- case 36: pValues[nProp] >>= aItem.aCompCompany; break;// "BusinessAddress/Company",
- case 37: pValues[nProp] >>= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt",
- case 38: pValues[nProp] >>= aItem.aCompSlogan; break;// "BusinessAddress/Slogan",
- case 39: pValues[nProp] >>= aItem.aCompStreet; break;// "BusinessAddress/Street",
- case 40: pValues[nProp] >>= aItem.aCompZip; break;// "BusinessAddress/Zip",
- case 41: pValues[nProp] >>= aItem.aCompCity; break;// "BusinessAddress/City",
- case 42: pValues[nProp] >>= aItem.aCompCountry; break;// "BusinessAddress/Country",
- case 43: pValues[nProp] >>= aItem.aCompState; break;// "BusinessAddress/State",
- case 44: pValues[nProp] >>= aItem.aCompPosition; break;// "BusinessAddress/Position",
- case 45: pValues[nProp] >>= aItem.aCompPhone; break;// "BusinessAddress/Phone",
- case 46: pValues[nProp] >>= aItem.aCompMobile; break;// "BusinessAddress/Mobile",
- case 47: pValues[nProp] >>= aItem.aCompFax; break;// "BusinessAddress/Fax",
- case 48: pValues[nProp] >>= aItem.aCompWWW; break;// "BusinessAddress/WebAddress",
- case 49: pValues[nProp] >>= aItem.aCompMail; break;// "BusinessAddress/Email",
- case 50: pValues[nProp] >>= aItem.sGlossaryGroup; break;// "AutoText/Group"
- case 51: pValues[nProp] >>= aItem.sGlossaryBlockName; break;// "AutoText/Block"
+ case 11:
+ pValues[nProp] >>= aItem.lPWidth;
+ aItem.lPWidth = MM100_TO_TWIP(aItem.lPWidth);
+ break;// "Format/PageWidth",
+ case 12:
+ pValues[nProp] >>= aItem.lPHeight;
+ aItem.lPHeight = MM100_TO_TWIP(aItem.lPHeight);
+ break;// "Format/PageHeight",
+ case 13: aItem.bSynchron = *(sal_Bool*)pValues[nProp].getValue(); break;// "Option/Synchronize",
+ case 14: aItem.bPage = *(sal_Bool*)pValues[nProp].getValue(); break;// "Option/Page",
+ case 15: pValues[nProp] >>= aItem.nCol; break;// "Option/Column",
+ case 16: pValues[nProp] >>= aItem.nRow; break;// "Option/Row"
+ case 17: aItem.bAddr = *(sal_Bool*)pValues[nProp].getValue(); break;// "Inscription/UseAddress",
+ case 18: pValues[nProp] >>= aItem.aWriting; break;// "Inscription/Address",
+ case 19: pValues[nProp] >>= aItem.sDBName; break;// "Inscription/Database"
+ case 20: pValues[nProp] >>= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName",
+ case 21: pValues[nProp] >>= aItem.aPrivName; break;// "PrivateAddress/Name",
+ case 22: pValues[nProp] >>= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut",
+ case 23: pValues[nProp] >>= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName",
+ case 24: pValues[nProp] >>= aItem.aPrivName2; break;// "PrivateAddress/SecondName",
+ case 25: pValues[nProp] >>= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut",
+ case 26: pValues[nProp] >>= aItem.aPrivStreet; break;// "PrivateAddress/Street",
+ case 27: pValues[nProp] >>= aItem.aPrivZip; break;// "PrivateAddress/Zip",
+ case 28: pValues[nProp] >>= aItem.aPrivCity; break;// "PrivateAddress/City",
+ case 29: pValues[nProp] >>= aItem.aPrivCountry; break;// "PrivateAddress/Country",
+ case 30: pValues[nProp] >>= aItem.aPrivState; break;// "PrivateAddress/State",
+ case 31: pValues[nProp] >>= aItem.aPrivTitle; break;// "PrivateAddress/Title",
+ case 32: pValues[nProp] >>= aItem.aPrivProfession; break;// "PrivateAddress/Profession",
+ case 33: pValues[nProp] >>= aItem.aPrivPhone; break;// "PrivateAddress/Phone",
+ case 34: pValues[nProp] >>= aItem.aPrivMobile; break;// "PrivateAddress/Mobile",
+ case 35: pValues[nProp] >>= aItem.aPrivFax; break;// "PrivateAddress/Fax",
+ case 36: pValues[nProp] >>= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress",
+ case 37: pValues[nProp] >>= aItem.aPrivMail; break;// "PrivateAddress/Email",
+ case 38: pValues[nProp] >>= aItem.aCompCompany; break;// "BusinessAddress/Company",
+ case 39: pValues[nProp] >>= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt",
+ case 40: pValues[nProp] >>= aItem.aCompSlogan; break;// "BusinessAddress/Slogan",
+ case 41: pValues[nProp] >>= aItem.aCompStreet; break;// "BusinessAddress/Street",
+ case 42: pValues[nProp] >>= aItem.aCompZip; break;// "BusinessAddress/Zip",
+ case 43: pValues[nProp] >>= aItem.aCompCity; break;// "BusinessAddress/City",
+ case 44: pValues[nProp] >>= aItem.aCompCountry; break;// "BusinessAddress/Country",
+ case 45: pValues[nProp] >>= aItem.aCompState; break;// "BusinessAddress/State",
+ case 46: pValues[nProp] >>= aItem.aCompPosition; break;// "BusinessAddress/Position",
+ case 47: pValues[nProp] >>= aItem.aCompPhone; break;// "BusinessAddress/Phone",
+ case 48: pValues[nProp] >>= aItem.aCompMobile; break;// "BusinessAddress/Mobile",
+ case 49: pValues[nProp] >>= aItem.aCompFax; break;// "BusinessAddress/Fax",
+ case 50: pValues[nProp] >>= aItem.aCompWWW; break;// "BusinessAddress/WebAddress",
+ case 51: pValues[nProp] >>= aItem.aCompMail; break;// "BusinessAddress/Email",
+ case 52: pValues[nProp] >>= aItem.sGlossaryGroup; break;// "AutoText/Group"
+ case 53: pValues[nProp] >>= aItem.sGlossaryBlockName; break;// "AutoText/Block"
}
}
}
@@ -402,7 +420,7 @@ void SwLabCfgItem::Commit()
for(int nProp = 0, nProperty = 0; nProp < aNames.getLength(); nProp++, nProperty++)
{
//to have a contiuous switch an offset is added
- if(nProp == 15 && !bIsLabel)
+ if(nProp == 17 && !bIsLabel)
nProperty += 3;
switch(nProperty)
{
@@ -417,47 +435,49 @@ void SwLabCfgItem::Commit()
case 8: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lHeight)); break;// "Format/Height",
case 9: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lLeft)); break;// "Format/LeftMargin",
case 10: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lUpper)); break;// "Format/TopMargin",
- case 11: pValues[nProp].setValue(&aItem.bSynchron, rType); break;// "Option/Synchronize",
- case 12: pValues[nProp].setValue(&aItem.bPage, rType); break;// "Option/Page",
- case 13: pValues[nProp] <<= aItem.nCol; break;// "Option/Column",
- case 14: pValues[nProp] <<= aItem.nRow; break;// "Option/Row"
- case 15: pValues[nProp].setValue(&aItem.bAddr, rType); break;// "Inscription/UseAddress",
- case 16: pValues[nProp] <<= aItem.aWriting; break;// "Inscription/Address",
- case 17: pValues[nProp] <<= aItem.sDBName; break;// "Inscription/Database"
- case 18: pValues[nProp] <<= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName",
- case 19: pValues[nProp] <<= aItem.aPrivName; break;// "PrivateAddress/Name",
- case 20: pValues[nProp] <<= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut",
- case 21: pValues[nProp] <<= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName",
- case 22: pValues[nProp] <<= aItem.aPrivName2; break;// "PrivateAddress/SecondName",
- case 23: pValues[nProp] <<= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut",
- case 24: pValues[nProp] <<= aItem.aPrivStreet; break;// "PrivateAddress/Street",
- case 25: pValues[nProp] <<= aItem.aPrivZip; break;// "PrivateAddress/Zip",
- case 26: pValues[nProp] <<= aItem.aPrivCity; break;// "PrivateAddress/City",
- case 27: pValues[nProp] <<= aItem.aPrivCountry; break;// "PrivateAddress/Country",
- case 28: pValues[nProp] <<= aItem.aPrivState; break;// "PrivateAddress/State",
- case 29: pValues[nProp] <<= aItem.aPrivTitle; break;// "PrivateAddress/Title",
- case 30: pValues[nProp] <<= aItem.aPrivProfession; break;// "PrivateAddress/Profession",
- case 31: pValues[nProp] <<= aItem.aPrivPhone; break;// "PrivateAddress/Phone",
- case 32: pValues[nProp] <<= aItem.aPrivMobile; break;// "PrivateAddress/Mobile",
- case 33: pValues[nProp] <<= aItem.aPrivFax; break;// "PrivateAddress/Fax",
- case 34: pValues[nProp] <<= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress",
- case 35: pValues[nProp] <<= aItem.aPrivMail; break;// "PrivateAddress/Email",
- case 36: pValues[nProp] <<= aItem.aCompCompany; break;// "BusinessAddress/Company",
- case 37: pValues[nProp] <<= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt",
- case 38: pValues[nProp] <<= aItem.aCompSlogan; break;// "BusinessAddress/Slogan",
- case 39: pValues[nProp] <<= aItem.aCompStreet; break;// "BusinessAddress/Street",
- case 40: pValues[nProp] <<= aItem.aCompZip; break;// "BusinessAddress/Zip",
- case 41: pValues[nProp] <<= aItem.aCompCity; break;// "BusinessAddress/City",
- case 42: pValues[nProp] <<= aItem.aCompCountry; break;// "BusinessAddress/Country",
- case 43: pValues[nProp] <<= aItem.aCompState; break;// "BusinessAddress/State",
- case 44: pValues[nProp] <<= aItem.aCompPosition; break;// "BusinessAddress/Position",
- case 45: pValues[nProp] <<= aItem.aCompPhone; break;// "BusinessAddress/Phone",
- case 46: pValues[nProp] <<= aItem.aCompMobile; break;// "BusinessAddress/Mobile",
- case 47: pValues[nProp] <<= aItem.aCompFax; break;// "BusinessAddress/Fax",
- case 48: pValues[nProp] <<= aItem.aCompWWW; break;// "BusinessAddress/WebAddress",
- case 49: pValues[nProp] <<= aItem.aCompMail; break;// "BusinessAddress/Email",
- case 50: pValues[nProp] <<= aItem.sGlossaryGroup; break;// "AutoText/Group"
- case 51: pValues[nProp] <<= aItem.sGlossaryBlockName; break;// "AutoText/Block"
+ case 11: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lPWidth)); break;// "Format/Page Width",
+ case 12: pValues[nProp] <<= static_cast<sal_Int32>(TWIP_TO_MM100(aItem.lPHeight)); break;// "Format/PageHeight",
+ case 13: pValues[nProp].setValue(&aItem.bSynchron, rType); break;// "Option/Synchronize",
+ case 14: pValues[nProp].setValue(&aItem.bPage, rType); break;// "Option/Page",
+ case 15: pValues[nProp] <<= aItem.nCol; break;// "Option/Column",
+ case 16: pValues[nProp] <<= aItem.nRow; break;// "Option/Row"
+ case 17: pValues[nProp].setValue(&aItem.bAddr, rType); break;// "Inscription/UseAddress",
+ case 18: pValues[nProp] <<= aItem.aWriting; break;// "Inscription/Address",
+ case 19: pValues[nProp] <<= aItem.sDBName; break;// "Inscription/Database"
+ case 20: pValues[nProp] <<= aItem.aPrivFirstName; break;// "PrivateAddress/FirstName",
+ case 21: pValues[nProp] <<= aItem.aPrivName; break;// "PrivateAddress/Name",
+ case 22: pValues[nProp] <<= aItem.aPrivShortCut; break;// "PrivateAddress/ShortCut",
+ case 23: pValues[nProp] <<= aItem.aPrivFirstName2; break;// "PrivateAddress/SecondFirstName",
+ case 24: pValues[nProp] <<= aItem.aPrivName2; break;// "PrivateAddress/SecondName",
+ case 25: pValues[nProp] <<= aItem.aPrivShortCut2; break;// "PrivateAddress/SecondShortCut",
+ case 26: pValues[nProp] <<= aItem.aPrivStreet; break;// "PrivateAddress/Street",
+ case 27: pValues[nProp] <<= aItem.aPrivZip; break;// "PrivateAddress/Zip",
+ case 28: pValues[nProp] <<= aItem.aPrivCity; break;// "PrivateAddress/City",
+ case 29: pValues[nProp] <<= aItem.aPrivCountry; break;// "PrivateAddress/Country",
+ case 30: pValues[nProp] <<= aItem.aPrivState; break;// "PrivateAddress/State",
+ case 31: pValues[nProp] <<= aItem.aPrivTitle; break;// "PrivateAddress/Title",
+ case 32: pValues[nProp] <<= aItem.aPrivProfession; break;// "PrivateAddress/Profession",
+ case 33: pValues[nProp] <<= aItem.aPrivPhone; break;// "PrivateAddress/Phone",
+ case 34: pValues[nProp] <<= aItem.aPrivMobile; break;// "PrivateAddress/Mobile",
+ case 35: pValues[nProp] <<= aItem.aPrivFax; break;// "PrivateAddress/Fax",
+ case 36: pValues[nProp] <<= aItem.aPrivWWW; break;// "PrivateAddress/WebAddress",
+ case 37: pValues[nProp] <<= aItem.aPrivMail; break;// "PrivateAddress/Email",
+ case 38: pValues[nProp] <<= aItem.aCompCompany; break;// "BusinessAddress/Company",
+ case 39: pValues[nProp] <<= aItem.aCompCompanyExt; break;// "BusinessAddress/CompanyExt",
+ case 40: pValues[nProp] <<= aItem.aCompSlogan; break;// "BusinessAddress/Slogan",
+ case 41: pValues[nProp] <<= aItem.aCompStreet; break;// "BusinessAddress/Street",
+ case 42: pValues[nProp] <<= aItem.aCompZip; break;// "BusinessAddress/Zip",
+ case 43: pValues[nProp] <<= aItem.aCompCity; break;// "BusinessAddress/City",
+ case 44: pValues[nProp] <<= aItem.aCompCountry; break;// "BusinessAddress/Country",
+ case 45: pValues[nProp] <<= aItem.aCompState; break;// "BusinessAddress/State",
+ case 46: pValues[nProp] <<= aItem.aCompPosition; break;// "BusinessAddress/Position",
+ case 47: pValues[nProp] <<= aItem.aCompPhone; break;// "BusinessAddress/Phone",
+ case 48: pValues[nProp] <<= aItem.aCompMobile; break;// "BusinessAddress/Mobile",
+ case 49: pValues[nProp] <<= aItem.aCompFax; break;// "BusinessAddress/Fax",
+ case 50: pValues[nProp] <<= aItem.aCompWWW; break;// "BusinessAddress/WebAddress",
+ case 51: pValues[nProp] <<= aItem.aCompMail; break;// "BusinessAddress/Email",
+ case 52: pValues[nProp] <<= aItem.sGlossaryGroup; break;// "AutoText/Group"
+ case 53: pValues[nProp] <<= aItem.sGlossaryBlockName; break;// "AutoText/Block"
}
}
PutProperties(aNames, aValues);
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-26 19:09:33 +0000