[Libreoffice-commits] .: Branch 'integration/dev300_m98' - 2 commits - svtools/Executable_bmp.mk svtools/Executable_bmpsum.mk svtools/Executable_g2g.mk svtools/inc svtools/Library_svt.mk svtools/source toolkit/inc toolkit/prj toolkit/source tools/inc tools/Library_tl.mk tools/source
Michael Meeks
mmeeks at kemper.freedesktop.org
Thu Feb 17 03:08:31 PST 2011
svtools/Executable_bmp.mk | 1
svtools/Executable_bmpsum.mk | 1
svtools/Executable_g2g.mk | 1
svtools/Library_svt.mk | 3
svtools/inc/svtools/borderhelper.hxx | 51
svtools/inc/svtools/toolpanel/toolpanel.hxx | 3
svtools/inc/svtools/xwindowitem.hxx | 70
svtools/source/contnr/templwin.cxx | 1
svtools/source/control/valueset.cxx | 16
svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx | 4
svtools/source/hatchwindow/hatchwindow.cxx | 3
svtools/source/hatchwindow/hatchwindowfactory.cxx | 2
svtools/source/misc/svtdata.cxx | 24
svtools/source/toolpanel/toolpaneldeckpeer.hxx | 72
toolkit/inc/toolkit/controls/dialogcontrol.hxx | 2
toolkit/inc/toolkit/controls/unocontrols.hxx | 12
toolkit/inc/toolkit/helper/solarrelease.hxx | 82 +
toolkit/prj/build.lst | 1
toolkit/source/controls/dialogcontrol.cxx | 34
toolkit/source/controls/unocontrols.cxx | 47
tools/Library_tl.mk | 1
tools/inc/tools/wintypes.hxx | 14
tools/source/string/reversemap.hxx | 943 +++++++++++++
23 files changed, 1266 insertions(+), 122 deletions(-)
New commits:
commit 9dc7f540f624eead5d044c8c3b6a8b60998c4dc3
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Feb 17 11:07:27 2011 +0000
add temporary built output for reversemapping
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index 5a2366a..c477dee 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -61,6 +61,7 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
icuuc \
jvmfwk \
sal \
+ salhelper \
sot \
stl \
svl \
@@ -225,6 +226,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\
svtools/source/misc/imap3 \
svtools/source/misc/itemdel \
svtools/source/misc/langtab \
+ svtools/source/misc/langhelp \
svtools/source/misc/stringtransfer \
svtools/source/misc/svtaccessiblefactory \
svtools/source/misc/svtdata \
diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx
index 8479692..650f02e 100644
--- a/svtools/source/misc/svtdata.cxx
+++ b/svtools/source/misc/svtdata.cxx
@@ -71,4 +71,9 @@ ImpSvtData & ImpSvtData::GetSvtData()
return *static_cast<ImpSvtData *>(*pAppData);
}
+SvtResId::SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale):
+ ResId(nId, *ImpSvtData::GetSvtData().GetResMgr(aLocale)) {}
+
+SvtResId::SvtResId(USHORT nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 33cc45f..c781339 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -114,6 +114,7 @@ $(eval $(call gb_Library_add_exception_objects,tl,\
tools/source/stream/strmsys \
tools/source/stream/vcompat \
tools/source/string/debugprint \
+ tools/source/string/reversemap \
tools/source/string/tenccvt \
tools/source/string/tstring \
tools/source/string/tustring \
diff --git a/tools/source/string/reversemap.hxx b/tools/source/string/reversemap.hxx
new file mode 100644
index 0000000..52f2e18
--- /dev/null
+++ b/tools/source/string/reversemap.hxx
@@ -0,0 +1,943 @@
+
+/*
+ * Urgh - checked in temporarily - until we merge m100 and
+ * can generate .cxx files nicely
+ */
+
+
+
+//Do not edit manually, generated from bestreversemap.cxx
+rtl_TextEncoding getBestMSEncodingByChar(sal_Unicode c)
+{
+ if (c < 0x80)
+ return RTL_TEXTENCODING_MS_1252;
+ if (c < 0xa0)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x100)
+ return RTL_TEXTENCODING_MS_1252;
+ if (c < 0x102)
+ return RTL_TEXTENCODING_MS_1257;
+ if (c < 0x108)
+ return RTL_TEXTENCODING_MS_1250;
+ if (c < 0x10c)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x112)
+ return RTL_TEXTENCODING_MS_1250;
+ if (c < 0x114)
+ return RTL_TEXTENCODING_MS_1257;
+ if (c < 0x116)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x11a)
+ return RTL_TEXTENCODING_MS_1257;
+ if (c < 0x11c)
+ return RTL_TEXTENCODING_MS_1250;
+ if (c < 0x11e)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x120)
+ return RTL_TEXTENCODING_MS_1254;
+ if (c < 0x122)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x124)
+ return RTL_TEXTENCODING_MS_1257;
+ if (c < 0x126)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x128)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x12a)
+ return RTL_TEXTENCODING_MS_1258;
+ if (c < 0x12c)
+ return RTL_TEXTENCODING_MS_1257;
+ if (c < 0x12e)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x130)
+ return RTL_TEXTENCODING_MS_1257;
+ if (c < 0x132)
+ return RTL_TEXTENCODING_MS_1254;
+ if (c < 0x134)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x136)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x138)
+ return RTL_TEXTENCODING_MS_1257;
+ if (c < 0x139)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x13b)
+ return RTL_TEXTENCODING_MS_1250;
+ if (c < 0x13d)
+ return RTL_TEXTENCODING_MS_1257;
+ if (c < 0x13f)
+ return RTL_TEXTENCODING_MS_1250;
+ if (c < 0x143)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x147)
+ return RTL_TEXTENCODING_MS_1257;
+ if (c < 0x149)
+ return RTL_TEXTENCODING_MS_1250;
+ if (c < 0x14c)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x14e)
+ return RTL_TEXTENCODING_MS_1257;
+ if (c < 0x150)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x152)
+ return RTL_TEXTENCODING_MS_1250;
+ if (c < 0x154)
+ return RTL_TEXTENCODING_MS_1252;
+ if (c < 0x156)
+ return RTL_TEXTENCODING_MS_1250;
+ if (c < 0x158)
+ return RTL_TEXTENCODING_MS_1257;
+ if (c < 0x15c)
+ return RTL_TEXTENCODING_MS_1250;
+ if (c < 0x15e)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x166)
+ return RTL_TEXTENCODING_MS_1250;
+ if (c < 0x168)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x16a)
+ return RTL_TEXTENCODING_MS_1258;
+ if (c < 0x16c)
+ return RTL_TEXTENCODING_MS_1257;
+ if (c < 0x16e)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x172)
+ return RTL_TEXTENCODING_MS_1250;
+ if (c < 0x174)
+ return RTL_TEXTENCODING_MS_1257;
+ if (c < 0x178)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x179)
+ return RTL_TEXTENCODING_MS_1252;
+ if (c < 0x17f)
+ return RTL_TEXTENCODING_MS_1250;
+ if (c < 0x192)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x193)
+ return RTL_TEXTENCODING_MS_1252;
+ if (c < 0x1a0)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x1a2)
+ return RTL_TEXTENCODING_MS_1258;
+ if (c < 0x1af)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x1b1)
+ return RTL_TEXTENCODING_MS_1258;
+ if (c < 0x1ce)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x1cf)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x1d0)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x1d1)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x1d2)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x1d3)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x1d4)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x1d5)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x1d6)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x1d7)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x1d8)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x1d9)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x1da)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x1db)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x1dc)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x1dd)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x251)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x252)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x261)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x262)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2c6)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2c7)
+ return RTL_TEXTENCODING_MS_1252;
+ if (c < 0x2c8)
+ return RTL_TEXTENCODING_MS_1250;
+ if (c < 0x2c9)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2cc)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2cd)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2ce)
+ return RTL_TEXTENCODING_MS_950;
+ if (c < 0x2d0)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2d1)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x2d8)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2dc)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x2dd)
+ return RTL_TEXTENCODING_MS_1252;
+ if (c < 0x2de)
+ return RTL_TEXTENCODING_MS_1250;
+ if (c < 0x300)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x302)
+ return RTL_TEXTENCODING_MS_1258;
+ if (c < 0x303)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x304)
+ return RTL_TEXTENCODING_MS_1258;
+ if (c < 0x309)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x30a)
+ return RTL_TEXTENCODING_MS_1258;
+ if (c < 0x323)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x324)
+ return RTL_TEXTENCODING_MS_1258;
+ if (c < 0x384)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x387)
+ return RTL_TEXTENCODING_MS_1253;
+ if (c < 0x388)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x38b)
+ return RTL_TEXTENCODING_MS_1253;
+ if (c < 0x38c)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x38d)
+ return RTL_TEXTENCODING_MS_1253;
+ if (c < 0x38e)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3a2)
+ return RTL_TEXTENCODING_MS_1253;
+ if (c < 0x3a3)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3cf)
+ return RTL_TEXTENCODING_MS_1253;
+ if (c < 0x401)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x40d)
+ return RTL_TEXTENCODING_MS_1251;
+ if (c < 0x40e)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x450)
+ return RTL_TEXTENCODING_MS_1251;
+ if (c < 0x451)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x45d)
+ return RTL_TEXTENCODING_MS_1251;
+ if (c < 0x45e)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x460)
+ return RTL_TEXTENCODING_MS_1251;
+ if (c < 0x490)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x492)
+ return RTL_TEXTENCODING_MS_1251;
+ if (c < 0x5b0)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x5ba)
+ return RTL_TEXTENCODING_MS_1255;
+ if (c < 0x5bb)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x5c4)
+ return RTL_TEXTENCODING_MS_1255;
+ if (c < 0x5d0)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x5eb)
+ return RTL_TEXTENCODING_MS_1255;
+ if (c < 0x5f0)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x5f5)
+ return RTL_TEXTENCODING_MS_1255;
+ if (c < 0x60c)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x60d)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x61b)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x61c)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x61f)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x620)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x621)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x63b)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x640)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x653)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x679)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x67a)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x67e)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x67f)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x686)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x687)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x688)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x689)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x691)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x692)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x698)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x699)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x6a9)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x6aa)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x6af)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x6b0)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x6ba)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x6bb)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x6be)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x6bf)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x6c1)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x6c2)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x6d2)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x6d3)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0xe01)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xe3b)
+ return RTL_TEXTENCODING_MS_874;
+ if (c < 0xe3f)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xe5c)
+ return RTL_TEXTENCODING_MS_874;
+ if (c < 0x1e3f)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x1e40)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x1ea0)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x1efa)
+ return RTL_TEXTENCODING_MS_1258;
+ if (c < 0x200c)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2010)
+ return RTL_TEXTENCODING_MS_1256;
+ if (c < 0x2011)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2013)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2017)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2018)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x201b)
+ return RTL_TEXTENCODING_MS_1252;
+ if (c < 0x201c)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x201f)
+ return RTL_TEXTENCODING_MS_1252;
+ if (c < 0x2020)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2023)
+ return RTL_TEXTENCODING_MS_1252;
+ if (c < 0x2025)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2028)
+ return RTL_TEXTENCODING_MS_950;
+ if (c < 0x2030)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2031)
+ return RTL_TEXTENCODING_MS_1252;
+ if (c < 0x2032)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2034)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2035)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2036)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2039)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x203b)
+ return RTL_TEXTENCODING_MS_1252;
+ if (c < 0x203c)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x203e)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x203f)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2074)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2075)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x207f)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2080)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x2081)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2085)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x20a9)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x20aa)
+ return RTL_TEXTENCODING_MS_1361;
+ if (c < 0x20ab)
+ return RTL_TEXTENCODING_MS_1255;
+ if (c < 0x20ad)
+ return RTL_TEXTENCODING_MS_1258;
+ if (c < 0x2103)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2104)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2105)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2106)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2109)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x210a)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2113)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2114)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x2116)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2117)
+ return RTL_TEXTENCODING_MS_1251;
+ if (c < 0x2121)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2123)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x2126)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2127)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x212b)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x212c)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2153)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2155)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x215b)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x215f)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x2160)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x216c)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2170)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x217a)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2190)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x219a)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x21d2)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x21d3)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x21d4)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x21d5)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2200)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2201)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2202)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2204)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2207)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2209)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x220b)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x220c)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x220f)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2210)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2211)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2213)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2215)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2216)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x221a)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x221b)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x221d)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2221)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2223)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2224)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2225)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2226)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2227)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x222d)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x222e)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x222f)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2234)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2238)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x223c)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x223e)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x2248)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2249)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x224c)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x224d)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2252)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2253)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2260)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2262)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2264)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2268)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x226a)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x226c)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x226e)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2270)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2282)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2284)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2286)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2288)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2295)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2296)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2299)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x229a)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x22a5)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x22a6)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x22bf)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x22c0)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x22ef)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x22f0)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2312)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2313)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2460)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2474)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x249c)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x24b6)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x24d0)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x24ea)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x2500)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x254c)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2550)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2575)
+ return RTL_TEXTENCODING_MS_950;
+ if (c < 0x2581)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2590)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x2592)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2593)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x2596)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x25a0)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x25a2)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x25a3)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x25aa)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x25b2)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x25b4)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x25b6)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x25b8)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x25bc)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x25be)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x25c0)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x25c2)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x25c6)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x25c9)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x25cb)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x25cc)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x25ce)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x25d2)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x25e2)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x25e6)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x25ef)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x25f0)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2605)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2607)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x2609)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x260a)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x260e)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2610)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x261c)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x261d)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x261e)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x261f)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x2640)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2643)
+ return RTL_TEXTENCODING_MS_950;
+ if (c < 0x2660)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2662)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x2663)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2666)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x2667)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x266b)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x266c)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x266e)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x266f)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x2670)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3000)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3004)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3005)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3018)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x301c)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x301f)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x3020)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3021)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x302a)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x3041)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3094)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x309b)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x309f)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x30a1)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x30f7)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x30fb)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x30ff)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3105)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x312a)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x3131)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x31ac)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x31ef)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x31ff)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x3200)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x321d)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x3220)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x322a)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x3231)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3233)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3239)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x323a)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3260)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x327c)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x327f)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3280)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x32a3)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x32a4)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x32a9)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3303)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3304)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x330d)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x330e)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3314)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3315)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3318)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3319)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3322)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3324)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3326)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3328)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x332b)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x332c)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3336)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3337)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x333b)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x333c)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3349)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x334b)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x334d)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x334e)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3351)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3352)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3357)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3358)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x337b)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x337f)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x3380)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x3385)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x3388)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x33cb)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x33cd)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x33ce)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0x33cf)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x33d1)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x33d3)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x33d4)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x33d5)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x33d6)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0x33d7)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x33d8)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x33d9)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x33db)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x33de)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0x4e00)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0x9fa6)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0xac00)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xd7a4)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0xe000)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xf849)
+ return RTL_TEXTENCODING_MS_950;
+ if (c < 0xf900)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xfa0c)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0xfa10)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0xfa2e)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0xfe30)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xfe32)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0xfe33)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xfe45)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0xfe49)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xfe53)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0xfe54)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xfe58)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0xfe59)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xfe67)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0xfe68)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xfe6c)
+ return RTL_TEXTENCODING_MS_936;
+ if (c < 0xff01)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xff5f)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0xff61)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xffa0)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0xffe0)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xffe6)
+ return RTL_TEXTENCODING_MS_932;
+ if (c < 0xffe7)
+ return RTL_TEXTENCODING_MS_949;
+ if (c < 0xfffd)
+ return RTL_TEXTENCODING_DONTKNOW;
+ if (c < 0xfffe)
+ return RTL_TEXTENCODING_MS_950;
+ return RTL_TEXTENCODING_DONTKNOW;
+}
commit ac4d31da9e05303e7bb0a2637973e3727fd1d48b
Author: Michael Meeks <michael.meeks at novell.com>
Date: Thu Feb 17 10:09:47 2011 +0000
fix more merge issues in toolkit, tools, svtools
diff --git a/svtools/Executable_bmp.mk b/svtools/Executable_bmp.mk
index 802aa6b..c59d990 100644
--- a/svtools/Executable_bmp.mk
+++ b/svtools/Executable_bmp.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Executable_add_linked_libs,bmp,\
stl \
tl \
vcl \
- vos3 \
))
$(eval $(call gb_Executable_add_exception_objects,bmp,\
diff --git a/svtools/Executable_bmpsum.mk b/svtools/Executable_bmpsum.mk
index 6f77ba2..4b6036f 100644
--- a/svtools/Executable_bmpsum.mk
+++ b/svtools/Executable_bmpsum.mk
@@ -41,7 +41,6 @@ $(eval $(call gb_Executable_add_linked_libs,bmpsum,\
stl \
tl \
vcl \
- vos3 \
))
$(eval $(call gb_Executable_add_exception_objects,bmpsum,\
diff --git a/svtools/Executable_g2g.mk b/svtools/Executable_g2g.mk
index 872d929..47770ae 100644
--- a/svtools/Executable_g2g.mk
+++ b/svtools/Executable_g2g.mk
@@ -43,7 +43,6 @@ $(eval $(call gb_Executable_add_linked_libs,g2g,\
svt \
tl \
vcl \
- vos3 \
))
$(eval $(call gb_Executable_add_exception_objects,g2g,\
diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk
index abaa9d8..5a2366a 100644
--- a/svtools/Library_svt.mk
+++ b/svtools/Library_svt.mk
@@ -69,7 +69,6 @@ $(eval $(call gb_Library_add_linked_libs,svt,\
ucbhelper \
utl \
vcl \
- vos3 \
))
ifeq ($(SYSTEM_JPEG),YES)
diff --git a/svtools/inc/svtools/borderhelper.hxx b/svtools/inc/svtools/borderhelper.hxx
new file mode 100644
index 0000000..0e0ba3c
--- /dev/null
+++ b/svtools/inc/svtools/borderhelper.hxx
@@ -0,0 +1,51 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Initial Developer of the Original Code is
+ * Novell, Inc.
+ * Portions created by the Initial Developer are Copyright (C) 2010 the
+ * Initial Developer. All Rights Reserved.
+ *
+ * Major Contributor(s):
+ * Cedric Bosdonnat <cbosdonnat at novell.com>
+ *
+ * For minor contributions see the git repository.
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+ * the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+ * in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+ * instead of those above.
+ */
+#ifndef _BORDERHELPER_HXX
+#define _BORDERHELPER_HXX
+
+#include "svtools/svtdllapi.h"
+
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <vcl/outdev.hxx>
+
+namespace svtools
+{
+ SVT_DLLPUBLIC basegfx::B2DPolyPolygon ApplyLineDashing( const basegfx::B2DPolygon& rPolygon,
+ USHORT nDashing, MapUnit eUnit );
+
+ SVT_DLLPUBLIC void DrawLine( OutputDevice& rDev, const Point& rBeg,
+ const Point& rEnd, sal_uInt32 nWidth, USHORT nDashing );
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/inc/svtools/toolpanel/toolpanel.hxx b/svtools/inc/svtools/toolpanel/toolpanel.hxx
index 12e4328..2f7eda0 100644
--- a/svtools/inc/svtools/toolpanel/toolpanel.hxx
+++ b/svtools/inc/svtools/toolpanel/toolpanel.hxx
@@ -33,7 +33,6 @@
#include <rtl/ustring.hxx>
#include <vcl/image.hxx>
-#include <vcl/smartid.hxx>
#include <boost/noncopyable.hpp>
@@ -63,7 +62,7 @@ namespace svt
virtual Image GetImage() const = 0;
/// retrieves the help ID associated with the panel, if any.
- virtual SmartId GetHelpID() const = 0;
+ virtual rtl::OString GetHelpID() const = 0;
/** activates the panel
diff --git a/svtools/inc/svtools/xwindowitem.hxx b/svtools/inc/svtools/xwindowitem.hxx
new file mode 100755
index 0000000..eca425c
--- /dev/null
+++ b/svtools/inc/svtools/xwindowitem.hxx
@@ -0,0 +1,70 @@
+/*************************************************************************
+ *
+ * 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: chrtitem.hxx,v $
+ * $Revision: 1.9 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+#ifndef _XWINDOWITEM_HXX_
+#define _XWINDOWITEM_HXX_
+
+
+#include "svtools/svtdllapi.h"
+
+#include <svl/poolitem.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+
+#include <com/sun/star/awt/XWindow.hpp>
+
+class Window;
+
+//////////////////////////////////////////////////////////////////////
+
+class SVT_DLLPUBLIC XWindowItem : public SfxPoolItem
+{
+ ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xWin;
+
+ // disallow use assignment operator
+ XWindowItem & operator = ( const XWindowItem & );
+
+public:
+ TYPEINFO();
+ XWindowItem();
+ explicit XWindowItem( USHORT nWhich, Window * pWin );
+ XWindowItem( USHORT nWhich, com::sun::star::uno::Reference< com::sun::star::awt::XWindow > & rxWin );
+ XWindowItem( const XWindowItem &rItem );
+ ~XWindowItem();
+
+ virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
+ virtual int operator == ( const SfxPoolItem& rAttr ) const;
+
+ Window * GetWindowPtr() const { return VCLUnoHelper::GetWindow( m_xWin ); }
+ com::sun::star::uno::Reference< com::sun::star::awt::XWindow > GetXWindow() const { return m_xWin; }
+};
+
+//////////////////////////////////////////////////////////////////////
+
+#endif
+
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index 4ddb38f..361ff99 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -30,6 +30,7 @@
#include "precompiled_svtools.hxx"
#include "templwin.hxx"
#include <svtools/templdlg.hxx>
+#include <svtools/langhelp.hxx>
#include <svtools/svtdata.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/dynamicmenuoptions.hxx>
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx
index f5888b4..ba06c9b 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -2741,20 +2741,4 @@ const Link& ValueSet::GetHighlightHdl() const
return mpImpl->maHighlightHdl;
}
-// -----------------------------------------------------------------------
-
-void ValueSet::SetHighlightHdl( const Link& rLink )
-{
- mpImpl->maHighlightHdl = rLink;
-}
-
-// -----------------------------------------------------------------------
-
-const Link& ValueSet::GetHighlightHdl() const
-{
- return mpImpl->maHighlightHdl;
-}
-
-// -----------------------------------------------------------------------
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
index 6a03348..0cbc72b 100644
--- a/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
+++ b/svtools/source/filter.vcl/filter/SvFilterOptionsDialog.cxx
@@ -144,7 +144,7 @@ uno::Sequence< beans::PropertyValue > SvFilterOptionsDialog::getPropertyValues()
sal_Int32 i, nCount;
for ( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ )
{
- if ( mMediaDescriptor[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterData")) )
+ if ( maMediaDescriptor[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterData")) )
break;
}
if ( i == nCount )
@@ -166,7 +166,7 @@ void SvFilterOptionsDialog::setPropertyValues( const uno::Sequence< beans::Prope
sal_Int32 i, nCount;
for ( i = 0, nCount = maMediaDescriptor.getLength(); i < nCount; i++ )
{
- if ( mMediaDescriptor[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterData")) )
+ if ( maMediaDescriptor[ i ].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FilterData")) )
{
maMediaDescriptor[ i ].Value >>= maFilterDataSequence;
}
diff --git a/svtools/source/hatchwindow/hatchwindow.cxx b/svtools/source/hatchwindow/hatchwindow.cxx
index 96849d5..47f74b2 100644
--- a/svtools/source/hatchwindow/hatchwindow.cxx
+++ b/svtools/source/hatchwindow/hatchwindow.cxx
@@ -34,7 +34,6 @@
#include "ipwin.hxx"
#include <toolkit/helper/convert.hxx>
-#include <vos/mutex.hxx>
#include <vcl/svapp.hxx>
using namespace ::com::sun::star;
@@ -53,7 +52,7 @@ void VCLXHatchWindow::initializeWindow( const uno::Reference< awt::XWindowPeer >
const awt::Rectangle& aBounds,
const awt::Size& aSize )
{
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
Window* pParent = NULL;
VCLXWindow* pParentComponent = VCLXWindow::GetImplementation( xParent );
diff --git a/svtools/source/hatchwindow/hatchwindowfactory.cxx b/svtools/source/hatchwindow/hatchwindowfactory.cxx
index 0292463..d08bb8d 100644
--- a/svtools/source/hatchwindow/hatchwindowfactory.cxx
+++ b/svtools/source/hatchwindow/hatchwindowfactory.cxx
@@ -71,7 +71,7 @@ uno::Reference< embed::XHatchWindow > SAL_CALL OHatchWindowFactory::createHatchW
if ( !xParent.is() )
throw lang::IllegalArgumentException(); // TODO
- ::vos::OGuard aGuard( Application::GetSolarMutex() );
+ SolarMutexGuard aGuard;
VCLXHatchWindow* pResult = new VCLXHatchWindow();
pResult->initializeWindow( xParent, aBounds, aHandlerSize );
return uno::Reference< embed::XHatchWindow >( static_cast< embed::XHatchWindow* >( pResult ) );
diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx
index 6643659..8479692 100644
--- a/svtools/source/misc/svtdata.cxx
+++ b/svtools/source/misc/svtdata.cxx
@@ -61,25 +61,6 @@ ResMgr * ImpSvtData::GetResMgr()
return GetResMgr(Application::GetSettings().GetUILocale());
}
-ResMgr * ImpSvtData::GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale)
-{
- if (!pPatchResMgr)
- {
- pPatchResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svp), aLocale);
- }
- return pPatchResMgr;
-}
-
-ResMgr * ImpSvtData::GetPatchResMgr()
-{
- return GetPatchResMgr(Application::GetSettings().GetUILocale());
-}
-
-SvpResId::SvpResId( USHORT nId ) :
- ResId( nId, *ImpSvtData::GetSvtData().GetPatchResMgr() )
-{
-}
-
//============================================================================
// static
ImpSvtData & ImpSvtData::GetSvtData()
diff --git a/svtools/source/toolpanel/toolpaneldeckpeer.hxx b/svtools/source/toolpanel/toolpaneldeckpeer.hxx
new file mode 100644
index 0000000..ce9bb65
--- /dev/null
+++ b/svtools/source/toolpanel/toolpaneldeckpeer.hxx
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*************************************************************************
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef SVT_TOOLPANELDECKPEER_HXX
+#define SVT_TOOLPANELDECKPEER_HXX
+
+#include "svtaccessiblefactory.hxx"
+
+/** === begin UNO includes === **/
+/** === end UNO includes === **/
+
+#include <toolkit/awt/vclxwindow.hxx>
+
+//......................................................................................................................
+namespace svt
+{
+//......................................................................................................................
+
+ class ToolPanelDeck;
+ //==================================================================================================================
+ //= ToolPanelDeckPeer
+ //==================================================================================================================
+ class ToolPanelDeckPeer : public VCLXWindow
+ {
+ public:
+ ToolPanelDeckPeer( ToolPanelDeck& i_rDeck );
+
+ protected:
+ ~ToolPanelDeckPeer();
+
+ // VCLXWindow overridables
+ virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > CreateAccessibleContext();
+
+ // XComponent
+ void SAL_CALL dispose() throw(::com::sun::star::uno::RuntimeException);
+
+ private:
+ AccessibleFactoryAccess m_aAccessibleFactory;
+ ToolPanelDeck* m_pDeck;
+ };
+
+//......................................................................................................................
+} // namespace svt
+//......................................................................................................................
+
+#endif // SVT_TOOLPANELDECKPEER_HXX
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/toolkit/inc/toolkit/controls/dialogcontrol.hxx b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
index 6c6649d..3621e93 100644
--- a/toolkit/inc/toolkit/controls/dialogcontrol.hxx
+++ b/toolkit/inc/toolkit/controls/dialogcontrol.hxx
@@ -186,8 +186,6 @@ public:
protected:
void startControlListening( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxChildModel );
void stopControlListening( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlModel >& _rxChildModel );
- // ::cppu::OPropertySetHelper
- void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception);
void implNotifyTabModelChange( const ::rtl::OUString& _rAccessor );
diff --git a/toolkit/inc/toolkit/controls/unocontrols.hxx b/toolkit/inc/toolkit/controls/unocontrols.hxx
index 7afd4d3..af9038d 100644
--- a/toolkit/inc/toolkit/controls/unocontrols.hxx
+++ b/toolkit/inc/toolkit/controls/unocontrols.hxx
@@ -72,17 +72,6 @@
#define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
#define UNO_NAME_GRAPHOBJ_URLPKGPREFIX "vnd.sun.star.Package:"
-class ImageHelper
-{
-public:
- // The routine will always attempt to return a valid XGraphic for the passed _rURL
- // additionallly xOutGraphicObject will container the associated XGraphicObject ( if url
- // is valid for that )
- // and is set appropriately ( e.g. NULL if non GraphicObject scheme ) or valid object
- // if the rURL points to a valid object
- static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicAndGraphicObjectFromURL_nothrow( ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject >& xOutGraphicObject, const ::rtl::OUString& _rURL );
-};
-
// ----------------------------------------------------
// class UnoControlEditModel
// ----------------------------------------------------
@@ -234,6 +223,7 @@ private:
bool mbAdjustingGraphic;
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphicObject > mxGrfObj;
+ ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL );
protected:
GraphicControlModel() : mbAdjustingImagePosition( false ), mbAdjustingGraphic( false ) { }
diff --git a/toolkit/inc/toolkit/helper/solarrelease.hxx b/toolkit/inc/toolkit/helper/solarrelease.hxx
new file mode 100644
index 0000000..e45a1b6
--- /dev/null
+++ b/toolkit/inc/toolkit/helper/solarrelease.hxx
@@ -0,0 +1,82 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * 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.
+ *
+ ************************************************************************/
+
+#ifndef TOOLKIT_INC_TOOLKIT_HELPER_SOLARRELEASE_HXX
+#define TOOLKIT_INC_TOOLKIT_HELPER_SOLARRELEASE_HXX
+
+#include <vcl/svapp.hxx>
+
+//........................................................................
+namespace toolkit
+{
+//........................................................................
+
+ //====================================================================
+ //= ReleaseSolarMutex
+ //====================================================================
+ class ReleaseSolarMutex
+ {
+ sal_uInt32 mnLockCount;
+ const bool mbRescheduleDuringAcquire;
+
+ public:
+ enum
+ {
+ RescheduleDuringAcquire = true
+ };
+
+ public:
+ ReleaseSolarMutex( const bool i_rescheduleDuringAcquire = false )
+ :mnLockCount( Application::ReleaseSolarMutex() )
+ ,mbRescheduleDuringAcquire( i_rescheduleDuringAcquire )
+ {
+
+ }
+
+ ~ReleaseSolarMutex()
+ {
+ if ( mnLockCount > 0 )
+ {
+ if ( mbRescheduleDuringAcquire )
+ {
+ while ( !Application::GetSolarMutex().tryToAcquire() )
+ {
+ Application::Reschedule();
+ }
+ --mnLockCount;
+ }
+ Application::AcquireSolarMutex( mnLockCount );
+ }
+ }
+ };
+
+//........................................................................
+} // namespace toolkit
+//........................................................................
+
+#endif // TOOLKIT_INC_TOOLKIT_HELPER_SOLARRELEASE_HXX
+
diff --git a/toolkit/prj/build.lst b/toolkit/prj/build.lst
index aacd9a9..b851421 100644
--- a/toolkit/prj/build.lst
+++ b/toolkit/prj/build.lst
@@ -1,4 +1,3 @@
ti toolkit : LIBXSLT:libxslt vcl NULL
ti toolkit\prj nmake - all ti_prj NULL
ti toolkit\qa\unoapi nmake - all ti_qa_unoapi NULL
-ti toolkit\qa\unoapi nmake - all ti_qa_unoapi NULL
diff --git a/toolkit/source/controls/dialogcontrol.cxx b/toolkit/source/controls/dialogcontrol.cxx
index ed96c60..144c3cd 100644
--- a/toolkit/source/controls/dialogcontrol.cxx
+++ b/toolkit/source/controls/dialogcontrol.cxx
@@ -390,40 +390,6 @@ Sequence< Type > UnoControlDialogModel::getTypes() throw(RuntimeException)
return ::rtl::OUString::createFromAscii( szServiceName_UnoControlDialogModel );
}
-void SAL_CALL UnoControlDialogModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception)
-{
- UnoControlModel::setFastPropertyValue_NoBroadcast( nHandle, rValue );
- try
- {
- switch ( nHandle )
- {
- case BASEPROPERTY_IMAGEURL:
- if ( !mbAdjustingGraphic && ImplHasProperty( BASEPROPERTY_GRAPHIC ) )
- {
- mbAdjustingGraphic = true;
- ::rtl::OUString sImageURL;
- OSL_VERIFY( rValue >>= sImageURL );
- setPropertyValue( GetPropertyName( BASEPROPERTY_GRAPHIC ), uno::makeAny( ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( mxGrfObj, sImageURL ) ) );
- mbAdjustingGraphic = false;
- }
- break;
-
- case BASEPROPERTY_GRAPHIC:
- if ( !mbAdjustingGraphic && ImplHasProperty( BASEPROPERTY_IMAGEURL ) )
- {
- mbAdjustingGraphic = true;
- setPropertyValue( GetPropertyName( BASEPROPERTY_IMAGEURL ), uno::makeAny( ::rtl::OUString() ) );
- mbAdjustingGraphic = false;
- }
- break;
- }
- }
- catch( const ::com::sun::star::uno::Exception& )
- {
- OSL_ENSURE( sal_False, "UnoControlDialogModel::setFastPropertyValue_NoBroadcast: caught an exception while setting Graphic/ImageURL properties!" );
- }
-}
-
Any UnoControlDialogModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
{
Any aAny;
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 75ab7ed..08a3463 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -537,44 +537,43 @@ uno::Any GraphicControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
return UnoControlModel::ImplGetDefaultValue( nPropId );
}
- uno::Reference< graphic::XGraphic > GraphicControlModel::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
- {
- uno::Reference< graphic::XGraphic > xGraphic;
- if( ( _rURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 ) )
+uno::Reference< graphic::XGraphic > GraphicControlModel::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
+{
+ uno::Reference< graphic::XGraphic > xGraphic;
+
+ if( ( _rURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 ) )
{
// graphic manager uniqueid
rtl::OUString sID = _rURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 );
// get the DefaultContext
::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
- xOutGraphicObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID );
+ mxGrfObj = graphic::GraphicObject::createWithId( aContext.getUNOContext(), sID );
}
- else // linked
- xOutGraphicObj = NULL; // release the GraphicObject
+ else // linked
+ mxGrfObj = NULL; // release the GraphicObject
- if ( !_rURL.getLength() )
- return xGraphic;
+ if ( !_rURL.getLength() )
+ return xGraphic;
- try
+ try
+ {
+ ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
+ uno::Reference< graphic::XGraphicProvider > xProvider;
+ if ( aContext.createComponent( "com.sun.star.graphic.GraphicProvider", xProvider ) )
{
- ::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
- uno::Reference< graphic::XGraphicProvider > xProvider;
- if ( aContext.createComponent( "com.sun.star.graphic.GraphicProvider", xProvider ) )
- {
- uno::Sequence< beans::PropertyValue > aMediaProperties(1);
- aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
- aMediaProperties[0].Value <<= _rURL;
- xGraphic = xProvider->queryGraphic( aMediaProperties );
- }
+ uno::Sequence< beans::PropertyValue > aMediaProperties(1);
+ aMediaProperties[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "URL" ) );
+ aMediaProperties[0].Value <<= _rURL;
+ xGraphic = xProvider->queryGraphic( aMediaProperties );
}
- catch( const Exception& )
- {
+ }
+ catch( const Exception& ) {
DBG_UNHANDLED_EXCEPTION();
- }
-
- return xGraphic;
}
+ return xGraphic;
+}
void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const ::com::sun::star::uno::Any& rValue ) throw (::com::sun::star::uno::Exception)
{
diff --git a/tools/inc/tools/wintypes.hxx b/tools/inc/tools/wintypes.hxx
index a280d33..06b9a88 100644
--- a/tools/inc/tools/wintypes.hxx
+++ b/tools/inc/tools/wintypes.hxx
@@ -187,6 +187,7 @@ typedef sal_Int64 WinBits;
#define WB_CHILDDLGCTRL ((WinBits)SAL_CONST_INT64(0x100000000000))
// system floating window
+#define WB_POPUP ((WinBits)SAL_CONST_INT64(0x20000000))
#define WB_SYSTEMFLOATWIN ((WinBits)SAL_CONST_INT64(0x100000000))
#define WB_INTROWIN ((WinBits)SAL_CONST_INT64(0x200000000))
#define WB_NOSHADOW ((WinBits)SAL_CONST_INT64(0x400000000))
@@ -194,7 +195,6 @@ typedef sal_Int64 WinBits;
#define WB_OWNERDRAWDECORATION ((WinBits)SAL_CONST_INT64(0x2000000000))
#define WB_DEFAULTWIN ((WinBits)SAL_CONST_INT64(0x4000000000))
#define WB_NEEDSFOCUS ((WinBits)SAL_CONST_INT64(0x1000000000))
-#define WB_POPUP ((WinBits)SAL_CONST_INT64(0x20000000))
#define WB_HSCROLL WB_HORZ
#define WB_VSCROLL WB_VERT
@@ -277,9 +277,15 @@ typedef sal_Int64 WinBits;
#define WB_STDPOPUP (WB_BORDER | WB_POPUP | WB_SYSTEMWINDOW | WB_3DLOOK | WB_DIALOGCONTROL)
// For TreeListBox
-#define WB_HASBUTTONS ((WinBits)0x00800000)
-#define WB_HASLINES ((WinBits)0x01000000)
-#define WB_HASLINESATROOT ((WinBits)0x02000000)
+#define WB_HASBUTTONS ((WinBits)SAL_CONST_INT64(0x000100000000))
+#define WB_HASLINES ((WinBits)SAL_CONST_INT64(0x000200000000))
+#define WB_HASLINESATROOT ((WinBits)SAL_CONST_INT64(0x000400000000))
+#define WB_HASBUTTONSATROOT ((WinBits)SAL_CONST_INT64(0x000800000000))
+#define WB_NOINITIALSELECTION ((WinBits)SAL_CONST_INT64(0x001000000000))
+#define WB_HIDESELECTION ((WinBits)SAL_CONST_INT64(0x002000000000))
+#define WB_FORCE_MAKEVISIBLE ((WinBits)SAL_CONST_INT64(0x004000000000))
+// DO NOT USE: 0x008000000000, that's WB_SYSTEMCHILDWINDOW
+#define WB_QUICK_SEARCH ((WinBits)SAL_CONST_INT64(0x010000000000))
// For FileOpen Dialog
#define WB_PATH ((WinBits)0x00100000)
More information about the Libreoffice-commits
mailing list