summaryrefslogtreecommitdiff
path: root/svx/source/items
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/items')
-rw-r--r--svx/source/items/SmartTagItem.cxx2
-rw-r--r--svx/source/items/clipfmtitem.cxx2
-rw-r--r--svx/source/items/flditem.cxx2
-rw-r--r--svx/source/items/frmitems.cxx6
-rw-r--r--svx/source/items/makefile.mk1
-rw-r--r--svx/source/items/numfmtsh.cxx4
-rw-r--r--svx/source/items/page.src258
-rw-r--r--svx/source/items/pageitem.cxx2
-rw-r--r--svx/source/items/paraitem.cxx8
-rw-r--r--svx/source/items/textitem.cxx6
10 files changed, 275 insertions, 16 deletions
diff --git a/svx/source/items/SmartTagItem.cxx b/svx/source/items/SmartTagItem.cxx
index 726aea57287f..73ea6edca1c6 100644
--- a/svx/source/items/SmartTagItem.cxx
+++ b/svx/source/items/SmartTagItem.cxx
@@ -40,7 +40,7 @@
#endif
-//#include <svtools/memberid.hrc>
+//#include <svl/memberid.hrc>
//#include "svxids.hrc"
//#include "svxitems.hrc"
diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx
index 5e07c233f115..59c907b476b2 100644
--- a/svx/source/items/clipfmtitem.cxx
+++ b/svx/source/items/clipfmtitem.cxx
@@ -34,7 +34,7 @@
#define _SVSTDARR_ULONGS
#define _SVSTDARR_STRINGSDTOR
-#include <svtools/svstdarr.hxx>
+#include <svl/svstdarr.hxx>
#include <clipfmtitem.hxx>
#include <com/sun/star/frame/status/ClipboardFormats.hpp>
diff --git a/svx/source/items/flditem.cxx b/svx/source/items/flditem.cxx
index 56f1a1986d82..05cdddcf307a 100644
--- a/svx/source/items/flditem.cxx
+++ b/svx/source/items/flditem.cxx
@@ -31,7 +31,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_svx.hxx"
#include <vcl/metaact.hxx>
-#include <svtools/zforlist.hxx>
+#include <svl/zforlist.hxx>
#include <tools/urlobj.hxx>
#define _SVX_FLDITEM_CXX
diff --git a/svx/source/items/frmitems.cxx b/svx/source/items/frmitems.cxx
index 39d21f253663..95d27d0341c3 100644
--- a/svx/source/items/frmitems.cxx
+++ b/svx/source/items/frmitems.cxx
@@ -52,14 +52,14 @@
#define _SVX_FRMITEMS_CXX
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
#include <svtools/wallitem.hxx>
-#include <svtools/cntwall.hxx>
+#include <svl/cntwall.hxx>
#include <rtl/ustring.hxx>
#include <rtl/ustrbuf.hxx>
-#include <impgrf.hxx>
+#include <svx/impgrf.hxx>
#include <svx/svxids.hrc>
#include <svx/svxitems.hrc>
#include <svx/dialogs.hrc>
diff --git a/svx/source/items/makefile.mk b/svx/source/items/makefile.mk
index ef4bf0b00149..d99f1705f5b4 100644
--- a/svx/source/items/makefile.mk
+++ b/svx/source/items/makefile.mk
@@ -50,6 +50,7 @@ LIBTARGET=NO
SRS1NAME=svxitems
SRC1FILES = \
svxerr.src \
+ page.src \
svxitems.src
LIB1TARGET= $(SLB)$/$(TARGET)-core.lib
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index ca6333753769..cb26266abb01 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -40,8 +40,8 @@
#include <i18npool/mslangid.hxx>
#define _ZFORLIST_DECLARE_TABLE
-#include <svtools/zforlist.hxx>
-#include <svtools/zformat.hxx>
+#include <svl/zforlist.hxx>
+#include <svl/zformat.hxx>
#include <svtools/langtab.hxx>
#include <vcl/svapp.hxx>
diff --git a/svx/source/items/page.src b/svx/source/items/page.src
new file mode 100644
index 000000000000..85cfd79e8cda
--- /dev/null
+++ b/svx/source/items/page.src
@@ -0,0 +1,258 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: page.src,v $
+ * $Revision: 1.71 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org. If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+ // include ---------------------------------------------------------------
+
+#include <svx/dialogs.hrc>
+
+String RID_SVXSTR_PAPER_A0
+{
+ Text = "A0" ;
+};
+String RID_SVXSTR_PAPER_A1
+{
+ Text = "A1" ;
+};
+String RID_SVXSTR_PAPER_A2
+{
+ Text = "A2" ;
+};
+String RID_SVXSTR_PAPER_A3
+{
+ Text = "A3" ;
+};
+String RID_SVXSTR_PAPER_A4
+{
+ Text = "A4" ;
+};
+String RID_SVXSTR_PAPER_A5
+{
+ Text = "A5" ;
+};
+String RID_SVXSTR_PAPER_B4_ISO
+{
+ Text = "B4 (ISO)" ;
+};
+String RID_SVXSTR_PAPER_B5_ISO
+{
+ Text = "B5 (ISO)" ;
+};
+String RID_SVXSTR_PAPER_LETTER
+{
+ Text = "Letter" ;
+};
+String RID_SVXSTR_PAPER_LEGAL
+{
+ Text = "Legal" ;
+};
+String RID_SVXSTR_PAPER_TABLOID
+{
+ Text = "Tabloid" ;
+};
+String RID_SVXSTR_PAPER_USER
+{
+ Text [ en-US ] = "User Defined" ;
+};
+String RID_SVXSTR_PAPER_B6_ISO
+{
+ Text = "B6 (ISO)" ;
+};
+String RID_SVXSTR_PAPER_C4
+{
+ Text = "C4 Envelope" ;
+};
+String RID_SVXSTR_PAPER_C5
+{
+ Text = "C5 Envelope" ;
+};
+String RID_SVXSTR_PAPER_C6
+{
+ Text = "C6 Envelope" ;
+};
+String RID_SVXSTR_PAPER_C65
+{
+ Text = "C6/5 Envelope" ;
+};
+String RID_SVXSTR_PAPER_DL
+{
+ Text = "DL Envelope" ;
+};
+String RID_SVXSTR_PAPER_DIA
+{
+ Text = "Dia Slide" ;
+};
+String RID_SVXSTR_PAPER_SCREEN
+{
+ Text [ en-US ] = "Screen" ;
+};
+String RID_SVXSTR_PAPER_C
+{
+ Text = "C" ;
+};
+String RID_SVXSTR_PAPER_D
+{
+ Text = "D" ;
+};
+String RID_SVXSTR_PAPER_E
+{
+ Text = "E" ;
+};
+String RID_SVXSTR_PAPER_EXECUTIVE
+{
+ Text = "Executive" ;
+};
+String RID_SVXSTR_PAPER_LEGAL2
+{
+ Text = "Long Bond" ;
+};
+String RID_SVXSTR_PAPER_MONARCH
+{
+ Text = "#8 (Monarch) Envelope" ;
+};
+String RID_SVXSTR_PAPER_COM675
+{
+ Text = "#6 3/4 (Personal) Envelope" ;
+};
+String RID_SVXSTR_PAPER_COM9
+{
+ Text = "#9 Envelope" ;
+};
+String RID_SVXSTR_PAPER_COM10
+{
+ Text = "#10 Envelope" ;
+};
+String RID_SVXSTR_PAPER_COM11
+{
+ Text = "#11 Envelope" ;
+};
+String RID_SVXSTR_PAPER_COM12
+{
+ Text = "#12 Envelope" ;
+};
+String RID_SVXSTR_PAPER_KAI16
+{
+ Text = "16 Kai" ;
+};
+String RID_SVXSTR_PAPER_KAI32
+{
+ Text = "32 Kai" ;
+};
+String RID_SVXSTR_PAPER_KAI32BIG
+{
+ Text = "Big 32 Kai" ;
+};
+String RID_SVXSTR_PAPER_B4_JIS
+{
+ Text = "B4 (JIS)" ;
+};
+String RID_SVXSTR_PAPER_B5_JIS
+{
+ Text = "B5 (JIS)" ;
+};
+String RID_SVXSTR_PAPER_B6_JIS
+{
+ Text = "B6 (JIS)" ;
+};
+String RID_SVXSTR_PAPERBIN
+{
+ Text [ en-US ] = "Paper tray" ;
+};
+String RID_SVXSTR_PAPERBIN_SETTINGS
+{
+ Text [ en-US ] = "[From printer settings]" ;
+};
+ // ********************************************************************** EOF
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/svx/source/items/pageitem.cxx b/svx/source/items/pageitem.cxx
index 4d96adb0c3b1..54eaf9b5898e 100644
--- a/svx/source/items/pageitem.cxx
+++ b/svx/source/items/pageitem.cxx
@@ -40,7 +40,7 @@
#include <svx/unomid.hxx>
#include <com/sun/star/style/PageStyleLayout.hpp>
#include <com/sun/star/style/BreakType.hpp>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
using namespace ::rtl;
using namespace ::com::sun::star;
diff --git a/svx/source/items/paraitem.cxx b/svx/source/items/paraitem.cxx
index d97ba065441d..bcdc7f451352 100644
--- a/svx/source/items/paraitem.cxx
+++ b/svx/source/items/paraitem.cxx
@@ -39,7 +39,7 @@
#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
#include <comphelper/processfactory.hxx>
#endif
-#include <svtools/syslocale.hxx>
+#include <unotools/syslocale.hxx>
#include <comphelper/types.hxx>
@@ -51,9 +51,9 @@ using namespace ::com::sun::star;
#define GLOBALOVERFLOW3
#define _SVX_PARAITEM_CXX
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
#include <svx/svxitems.hrc>
#include <svx/lspcitem.hxx>
@@ -283,7 +283,7 @@ SfxItemPresentation SvxLineSpacingItem::GetPresentation
XubString& rText, const IntlWrapper *
) const
{
-#ifndef PRODUCT
+#ifdef DBG_UTIL
rText.AssignAscii( RTL_CONSTASCII_STRINGPARAM( "SvxLineSpacingItem" ));
#else
rText.Erase();
diff --git a/svx/source/items/textitem.cxx b/svx/source/items/textitem.cxx
index 2d1e5b6ebf9f..d891dc29b10c 100644
--- a/svx/source/items/textitem.cxx
+++ b/svx/source/items/textitem.cxx
@@ -47,7 +47,7 @@
#define GLOBALOVERFLOW3
-#include <svtools/memberid.hrc>
+#include <svl/memberid.hrc>
#include <svx/svxids.hrc>
#include <svx/svxitems.hrc>
#include <vcl/vclenum.hxx>
@@ -56,10 +56,10 @@
#include <rtl/ustring.hxx>
#include <i18npool/mslangid.hxx>
-#include <svtools/itemset.hxx>
+#include <svl/itemset.hxx>
#include <svtools/langtab.hxx>
-#include <svtools/itempool.hxx>
+#include <svl/itempool.hxx>
#include <svtools/ctrltool.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>