diff options
author | os <os@openoffice.org> | 2009-11-10 15:32:07 +0100 |
---|---|---|
committer | os <os@openoffice.org> | 2009-11-10 15:32:07 +0100 |
commit | 001cc8fcaaa5614aa63bbd3184b6f1780ab57dbb (patch) | |
tree | 5d98a4730af6d3066b98a63280a7407823d125e9 /tools | |
parent | 59cfb5db4135f4e57e40143cb03f944982c6eff8 (diff) | |
parent | 24534f00dd8799b3c2b2365ccd8c0009e19cddd5 (diff) |
rebase
Diffstat (limited to 'tools')
-rw-r--r-- | tools/inc/tools/errcode.hxx | 1 | ||||
-rw-r--r-- | tools/inc/tools/rc.h | 1 | ||||
-rw-r--r-- | tools/source/fsys/urlobj.cxx | 7 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tools/inc/tools/errcode.hxx b/tools/inc/tools/errcode.hxx index af420397eba2..337fedfea44a 100644 --- a/tools/inc/tools/errcode.hxx +++ b/tools/inc/tools/errcode.hxx @@ -314,6 +314,7 @@ inline ULONG ERRCODE_TOERROR( ULONG x ) #define PRINTER_ABORT ERRCODE_IO_ABORT #define PRINTER_OUTOFMEMORY ERRCODE_IO_OUTOFMEMORY #define PRINTER_GENERALERROR ERRCODE_IO_GENERAL +#define PRINTER_ACCESSDENIED ERRCODE_IO_ACCESSDENIED #define ERRCODE_INET_NAME_RESOLVE (ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 1) #define ERRCODE_INET_CONNECT (ERRCODE_AREA_INET | ERRCODE_CLASS_READ | 2) diff --git a/tools/inc/tools/rc.h b/tools/inc/tools/rc.h index 11d6e2030162..8bad7dbf3f8a 100644 --- a/tools/inc/tools/rc.h +++ b/tools/inc/tools/rc.h @@ -102,6 +102,7 @@ typedef short RSWND_STYLE; //#define NUMERICFORMATTER_I12 0x08 // erAck: got rid of class International (2005-06-17) #define NUMERICFORMATTER_DECIMALDIGITS 0x10 #define NUMERICFORMATTER_VALUE 0x20 +#define NUMERICFORMATTER_NOTHOUSANDSEP 0x40 #define METRICFORMATTER_UNIT 0x01 #define METRICFORMATTER_CUSTOMUNITTEXT 0x02 diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index 2aff0d734bf6..f7ffed5e4dd1 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -407,7 +407,7 @@ static INetURLObject::SchemeInfo const aSchemeInfoMap[INET_PROT_END] { "out", "out://", 0, true, false, false, false, false, false, false, false }, { "vnd.sun.star.wfs", "vnd.sun.star.wfs://", 0, true, false, false, - false, true, false, true, false }, + false, true, true, true, false }, { "vnd.sun.star.hier", "vnd.sun.star.hier:", 0, true, false, false, false, false, false, true, false }, { "vim", "vim://", 0, true, true, false, true, false, false, true, @@ -4825,9 +4825,8 @@ bool INetURLObject::setFSysPath(rtl::OUString const & rFSysPath, break; } - rtl::OUStringBuffer aSynAbsURIRef( - rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://"), - RTL_TEXTENCODING_ASCII_US)); + rtl::OUStringBuffer aSynAbsURIRef(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("file://"))); + switch (eStyle) { case FSYS_VOS: |