[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sax/source

[Cédric Bosdonnat]

 sax/source/fastparser/fastparser.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 49b90c89ab054b245a4ffda4ce3c579b9d767d55
Author: Cédric Bosdonnat 
Date:   Tue Jul 2 15:46:59 2013 +0200

fastsax: provide the element name instead of prefix for unknown elements

Change-Id: I3effd8a0cfe57875446536bbd0a93a73e630a44f
(cherry picked from commit 4946cc813704703f7d988a6acf75c4d9e9c068a9)
Reviewed-on: https://gerrit.libreoffice.org/4702
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 1a80ed1..7ef48fd 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -812,7 +812,7 @@ void FastSaxParser::callbackStartElement( const XML_Char* 
pwName, const XML_Char
 rEntity.maContextStack.top()->maNamespace = GetNamespaceURL( 
pPrefix, nPrefixLen );
 
 const OUString aNamespace( 
rEntity.maContextStack.top()->maNamespace );
-const OUString aElementName( pPrefix, nPrefixLen, 
RTL_TEXTENCODING_UTF8 );
+const OUString aElementName( pName, nNameLen, 
RTL_TEXTENCODING_UTF8 );
 rEntity.maContextStack.top()->maElementName = aElementName;
 
 if( xParentContext.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - sax/source

[Cédric Bosdonnat]

 sax/source/fastparser/fastparser.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6faedf249f1fed22cc2b901b2a39b715902ca353
Author: Cédric Bosdonnat 
Date:   Tue Jul 2 15:46:59 2013 +0200

fastsax: provide the element name instead of prefix for unknown elements

Change-Id: I3effd8a0cfe57875446536bbd0a93a73e630a44f
(cherry picked from commit 4946cc813704703f7d988a6acf75c4d9e9c068a9)
Reviewed-on: https://gerrit.libreoffice.org/4704
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index 4f63130..cf08a76 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -815,7 +815,7 @@ void FastSaxParser::callbackStartElement( const XML_Char* 
pwName, const XML_Char
 rEntity.maContextStack.top()->maNamespace = GetNamespaceURL( 
pPrefix, nPrefixLen );
 
 const OUString aNamespace( 
rEntity.maContextStack.top()->maNamespace );
-const OUString aElementName( pPrefix, nPrefixLen, 
RTL_TEXTENCODING_UTF8 );
+const OUString aElementName( pName, nNameLen, 
RTL_TEXTENCODING_UTF8 );
 rEntity.maContextStack.top()->maElementName = aElementName;
 
 if( xParentContext.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - download.lst libvisio/libvisio-0.0.29-remove_whitespace.patch.1 libvisio/UnpackedTarball_visio.mk

[Fridrich Štrba]

 download.lst   |4 ++--
 libvisio/UnpackedTarball_visio.mk  |3 +++
 libvisio/libvisio-0.0.29-remove_whitespace.patch.1 |   20 
 3 files changed, 25 insertions(+), 2 deletions(-)

New commits:
commit 815e1cb47080df5a85ae747856228db8441336f2
Author: Fridrich Å trba 
Date:   Tue Jul 2 14:46:55 2013 +0200

Uploading new libvisio 0.0.29, fixing fdo#66421

(cherry picked from commit 50b0bf15bf0e173ba449efed93ef3909253b9988)
Reviewed-on: https://gerrit.libreoffice.org/4678
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit 3820420edfb828e49735becf796803f0558ef844)

Conflicts:
download.lst

Change-Id: I7b9bc581c81caf74cb6f922abc2cfaee87b20572

Allow build with older boost

(cherry picked from commit d37723a2496907bf60829306c6509fe24a9c4dbe)
Reviewed-on: https://gerrit.libreoffice.org/4681
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 
(cherry picked from commit 48259302d6cdf069fccc00461e7ad44b414f93e5)

Conflicts:
libvisio/UnpackedTarball_libvisio.mk

Change-Id: I49902109eb2a1b9561a9ccfa70d89c160a4965a9
Reviewed-on: https://gerrit.libreoffice.org/4711
Reviewed-by: Bosdonnat Cedric 
Tested-by: Bosdonnat Cedric 

diff --git a/download.lst b/download.lst
index ee3a84d..7961366 100644
--- a/download.lst
+++ b/download.lst
@@ -2,8 +2,8 @@ CDR_MD5SUM := d88f9b94df880d2c05be943b000ca112
 export CDR_TARBALL := libcdr-0.0.14.tar.bz2
 MSPUB_MD5SUM := 1120705cd0f0d9bd5506360bf57b6c2e
 export MSPUB_TARBALL := libmspub-0.0.6.tar.bz2
-VISIO_MD5SUM := 05574c2ec54dd0c29d75cacdf9419f44
-export VISIO_TARBALL := libvisio-0.0.28.tar.bz2
+VISIO_MD5SUM := ca7a83bb2d81467e1f0222980cc08939
+export VISIO_TARBALL := libvisio-0.0.29.tar.bz2
 
 export AFMS_TARBALL := 
1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz
 export APACHE_COMMONS_CODEC_TARBALL := 
af3c3acf618de6108d65fcdc92b492e1-commons-codec-1.3-src.tar.gz
diff --git a/libvisio/UnpackedTarball_visio.mk 
b/libvisio/UnpackedTarball_visio.mk
index 59c29ac..eacc570 100644
--- a/libvisio/UnpackedTarball_visio.mk
+++ b/libvisio/UnpackedTarball_visio.mk
@@ -11,5 +11,8 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,visio))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,visio,$(VISIO_TARBALL)))
 
+$(eval $(call gb_UnpackedTarball_add_patches,visio,\
+   libvisio/libvisio-0.0.29-remove_whitespace.patch.1 \
+))
 
 # vim: set noet sw=4 ts=4:
diff --git a/libvisio/libvisio-0.0.29-remove_whitespace.patch.1 
b/libvisio/libvisio-0.0.29-remove_whitespace.patch.1
new file mode 100644
index 000..b8f1eb4
--- /dev/null
+++ b/libvisio/libvisio-0.0.29-remove_whitespace.patch.1
@@ -0,0 +1,20 @@
+--- a/src/lib/libvisio_utils.cpp
 b/src/lib/libvisio_utils.cpp
+@@ -33,7 +33,6 @@
+ #include "libvisio_utils.h"
+ 
+ #include 
+-#include 
+ #include 
+ 
+ uint8_t libvisio::readU8(WPXInputStream *input)
+@@ -126,8 +125,7 @@ double libvisio::readDouble(WPXInputStream *input)
+ void libvisio::appendFromBase64(WPXBinaryData &data, const unsigned char 
*base64String, size_t base64StringLength)
+ {
+   typedef boost::archive::iterators::transform_width<
+-  boost::archive::iterators::binary_from_base64<
+-  boost::archive::iterators::remove_whitespace< const char * > >, 8, 6 > 
base64_decoder;
++  boost::archive::iterators::binary_from_base64< const char * >, 8, 6 > 
base64_decoder;
+ 
+   std::vector buffer;
+   std::copy(base64_decoder(base64String), base64_decoder(base64String + 
base64StringLength), std::back_inserter(buffer));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 4 commits - include/svx include/vcl svx/source sw/inc sw/source sw/uiconfig sw/UIConfig_swriter.mk unusedcode.easy vcl/source

[Caolán McNamara]

 include/svx/galtheme.hxx |1 
 include/vcl/unohelp.hxx  |2 
 svx/source/gallery2/galtheme.cxx |1 
 sw/UIConfig_swriter.mk   |1 
 sw/inc/globals.hrc   |2 
 sw/inc/helpid.h  |1 
 sw/source/ui/config/optload.cxx  |  209 ++-
 sw/source/ui/config/optload.hrc  |   21 -
 sw/source/ui/config/optload.src  |  139 --
 sw/source/ui/dialog/swdlgfact.cxx|1 
 sw/source/ui/inc/optload.hxx |   49 +--
 sw/uiconfig/swriter/ui/optgeneralpage.ui |  426 +++
 unusedcode.easy  |2 
 vcl/source/control/ilstbox.cxx   |   11 
 vcl/source/window/builder.cxx|3 
 15 files changed, 543 insertions(+), 326 deletions(-)

New commits:
commit 0581c61c8b61041692befac101466190767e6597
Author: Caolán McNamara 
Date:   Wed Jul 3 18:30:07 2013 +0100

Resolves: fdo#66407 convert writer general options tab to .ui

Change-Id: I315c12b94663c0047150eed7ecbd6366f7e57bc4

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 109dfef..dd533a7 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -102,6 +102,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/numberingnamedialog \
sw/uiconfig/swriter/ui/optcomparison \
sw/uiconfig/swriter/ui/optformataidspage \
+   sw/uiconfig/swriter/ui/optgeneralpage \
sw/uiconfig/swriter/ui/opttestpage \
sw/uiconfig/swriter/ui/outlinenumbering \
sw/uiconfig/swriter/ui/outlinenumberingpage \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index f380db9..8411ebf 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -186,7 +186,7 @@
 
 #define TP_OPTCAPTION_PAGE  (RC_GLOBALS_BEGIN +  78)
 #define DLG_SVXTEST_NUM_BULLET  (RC_GLOBALS_BEGIN +  79)
-#define TP_OPTLOAD_PAGE (RC_GLOBALS_BEGIN +  80)
+
 #define TP_INSERT_SECTION   (RC_GLOBALS_BEGIN +  85)
 #define DLG_INSERT_SECTION  (RC_GLOBALS_BEGIN +  86)
 #define DLG_SECTION_PROPERTIES  (RC_GLOBALS_BEGIN +  87)
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index ee1ae83..1bd27a4 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -173,7 +173,6 @@
 #define HID_EDIT_FLD_REF
"SW_HID_EDIT_FLD_REF"
 #define HID_REDLINE_CTRL
"SW_HID_REDLINE_CTRL"
 #define HID_OPTCAPTION_PAGE 
"SW_HID_OPTCAPTION_PAGE"
-#define HID_OPTLOAD_PAGE
"SW_HID_OPTLOAD_PAGE"
 #define HID_INSERT_SECTION_PAGE 
"SW_HID_INSERT_SECTION_PAGE"
 #define HID_INSERT_SECTION_DLG  
"SW_HID_INSERT_SECTION_DLG"
 #define HID_SECTION_PROPERTIES_DLG  
"SW_HID_SECTION_PROPERTIES_DLG"
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 0bc1b8b..500438c 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -61,38 +61,24 @@ using namespace ::com::sun::star;
 
 #include 
 
-SwLoadOptPage::SwLoadOptPage( Window* pParent, const SfxItemSet& rSet ) :
-
-SfxTabPage( pParent, SW_RES( TP_OPTLOAD_PAGE ), rSet ),
-
-aUpdateFL   ( this, SW_RES( FL_UPDATE ) ),
-aLinkFT ( this, SW_RES( FT_LINK ) ),
-aAlwaysRB   ( this, SW_RES( RB_ALWAYS ) ),
-aRequestRB  ( this, SW_RES( RB_REQUEST ) ),
-aNeverRB( this, SW_RES( RB_NEVER  ) ),
-
-aFieldFT( this, SW_RES( FT_FIELD ) ),
-aAutoUpdateFields   ( this, SW_RES( CB_AUTO_UPDATE_FIELDS ) ),
-aAutoUpdateCharts   ( this, SW_RES( CB_AUTO_UPDATE_CHARTS ) ),
-
-aSettingsFL ( this, SW_RES( FL_SETTINGS ) ),
-aMetricFT   ( this, SW_RES( FT_METRIC ) ),
-aMetricLB   ( this, SW_RES( LB_METRIC ) ),
-aTabFT  ( this, SW_RES( FT_TAB ) ),
-aTabMF  ( this, SW_RES( MF_TAB ) ),
-aUseSquaredPageMode ( this, SW_RES( CB_USE_SQUARE_PAGE_MODE ) ),
-aUseCharUnit( this , SW_RES( CB_USE_CHAR_UNIT ) ),
-aWordCountFL( this , SW_RES( FL_WORDCOUNT ) ),
-aWordCountFT( this , SW_RES( FT_WORDCOUNT ) ),
-aWordCountED( this , SW_RES( ED_WORDCOUNT ) ),
-
-pWrtShell   ( NULL ),
-bHTMLMode   ( sal_False ),
-nLastTab( 0 ),
-nOldLinkMode( MANUAL )
-
+SwLoadOptPage::SwLoadOptPage(Window* pParent, const SfxItemSet& rSet)
+: SfxTabPage(pParent, "OptGeneralPage",
+"modules/swriter/ui/optgeneralpage.ui", rSet)
+, m_pWrtShell(NULL)
+, m_nLastTab(0)
+, m_nOldLinkMode(MANUAL)
 {
-FreeResource();
+get(m_pAlwaysRB, "always");
+get(m_pRequestRB, "onrequest");
+get(m_pNeverRB, "never");
+get(m_pAutoUpdateFields, "updatefields");
+

OConnection.cxx patch

[Gabriele Bulfon]

Hi,
I had to patch this file to build without errors:
--- libreoffice-4.1.0.1/connectivity/source/drivers/odbcbase/OConnection.cxx
Thu Jul  4 08:33:42 2013
+++ libreoffice-4.1.0.1/connectivity/source/drivers/odbcbase/OConnection.cxx
Thu Jul  4 08:34:55 2013
@@ -417,7 +417,7 @@
checkDisposed(OConnection_BASE::rBHelper.bDisposed);
-sal_Int32 nValueLen;
+SQLINTEGER nValueLen;
char pCat[1024];
OTools::ThrowException(this,
N3SQLGetConnectAttr(m_aConnectionHandle,SQL_ATTR_CURRENT_CATALOG,(SDB_ODBC_CHAR*)pCat,(sizeof
 pCat)-1,&nValueLen),
Gabriele Bulfon - Sonicle S.r.l.
Tel +39 028246016 Int. 30 - Fax +39 028243880
via Santa Maria Valle 3 - 20123 - Milano - Italy
http://www.sonicle.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

final link failed: Bad value

[Gabriele Bulfon]

Hi,
after long building LO 4.1.0.1 on illumos based OS, I reached this error:
[build LNK] Executable/unopkg.bin
/usr/gnu/bin/ld: 
/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/workdir/unxsogi.pro/LinkTarget/Executable/unopkg.bin:
 hidden symbol `main' in 
/sources/userlands/xstream-userland-gate/components/libreoffice/libreoffice-4.1.0.1/workdir/unxsogi.pro/CObject/desktop/source/pkgchk/unopkg/unopkg_main.o
 is referenced by DSO
/usr/gnu/bin/ld: final link failed: Bad value
collect2: ld returned 1 exit status
Any idea?
Gabriele.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Writer Line Numbering Import \ Export

[Miklos Vajna]

Hi,

On Tue, Jul 02, 2013 at 02:32:41PM +0300, Adam Fyne  
wrote:
> There is a bug I am trying to fix regarding line numbering.

Seeing https://gerrit.libreoffice.org/#/c/4693/, I hope you figured this
out in the meantime. :-)

> Is it true to say that DOCX attributes are always 'NS_ooxml::….' ?

For the reference, this is not correct, in
writerfilter/source/ooxml/model.xml, search for "sprm:", in those cases
OOXML attributes are mapped to sprm tokens as well.

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b775c8043242a8657eae11bae4085bd4291ac580
Author: Caolán McNamara 
Date:   Thu Jul 4 09:00:42 2013 +0100

Updated core
Project: help  7de50a3f88322f0de1f334c2811bcfd73d816cf5

diff --git a/helpcontent2 b/helpcontent2
index e4fcd65..7de50a3 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit e4fcd6566109736c1d2c17cd1b8be157ee7097db
+Subproject commit 7de50a3f88322f0de1f334c2811bcfd73d816cf5
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst |9 ---
 source/text/shared/optionen/01040900.xhp |   36 +++
 source/text/shared/optionen/01041000.xhp |4 ---
 3 files changed, 18 insertions(+), 31 deletions(-)

New commits:
commit 7de50a3f88322f0de1f334c2811bcfd73d816cf5
Author: Caolán McNamara 
Date:   Thu Jul 4 09:00:42 2013 +0100

update help ids for writer general opt page .ui conversion

Change-Id: I180c3a10578a125bc1e2f803a653d650ce80100d

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index af7c2aa..cbd5724 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2657,7 +2657,6 @@ HID_OPTIONS_JAVA_PARAMETER,39998,
 HID_OPTIONS_LINGU,33812,
 HID_OPTIONS_MULTIPATH_LIST,40056,
 HID_OPTIONS_PATHS_SELECTFOLDER,39876,
-HID_OPTLOAD_PAGE,53230,
 HID_OPTMAKECHANGES,41151,
 HID_OPTPATH_CTL_PATH,33888,
 HID_OPTPATH_HEADERBAR,34069,
@@ -7932,9 +7931,6 @@ sw_CheckBox_TP_LINENUMBERING_CB_RESTART_PAGE,878887959,
 sw_CheckBox_TP_MAILCONFIG_CB_REPLYTO,879363078,
 sw_CheckBox_TP_MAILCONFIG_CB_SECURE,879363086,
 sw_CheckBox_TP_OPTCAPTION_PAGE_CB_APPLYBORDER,878937117,
-sw_CheckBox_TP_OPTLOAD_PAGE_CB_AUTO_UPDATE_CHARTS,878969873,
-sw_CheckBox_TP_OPTLOAD_PAGE_CB_AUTO_UPDATE_FIELDS,878969872,
-sw_CheckBox_TP_OPTLOAD_PAGE_CB_USE_SQUARE_PAGE_MODE,878969879,
 sw_CheckBox_TP_OPTSHDWCRSR_CB_ALLOW_IN_PROT,878806028,
 sw_CheckBox_TP_OPTSHDWCRSR_CB_BREAK,878806027,
 sw_CheckBox_TP_OPTSHDWCRSR_CB_CHAR_HIDDEN,878806077,
@@ -8204,7 +8200,6 @@ sw_ListBox_TP_OPTCAPTION_PAGE_LB_CHARSTYLE,878939676,
 sw_ListBox_TP_OPTCAPTION_PAGE_LB_LEVEL,878939671,
 sw_ListBox_TP_OPTCAPTION_PAGE_LB_ORDER,878939680,
 sw_ListBox_TP_OPTCOMPATIBILITY_PAGE_LB_FORMATTING,879349260,
-sw_ListBox_TP_OPTLOAD_PAGE_LB_METRIC,878972435,
 sw_ListBox_TP_REDLINE_OPT_LB_CHG_ATTR,878874124,
 sw_ListBox_TP_REDLINE_OPT_LB_CHG_COL,878874126,
 sw_ListBox_TP_REDLINE_OPT_LB_DEL_ATTR,878874119,
@@ -8287,7 +8282,6 @@ sw_MetricField_TP_LAB_FMT_FLD_UPPER,909711885,
 sw_MetricField_TP_LAB_FMT_FLD_VDIST,909711877,
 sw_MetricField_TP_LAB_FMT_FLD_WIDTH,909711879,
 sw_MetricField_TP_LINENUMBERING_MF_OFFSET,878893577,
-sw_MetricField_TP_OPTLOAD_PAGE_MF_TAB,878975510,
 sw_MetricField_TP_OPTTABLE_PAGE_MF_COLINSERT,878582391,
 sw_MetricField_TP_OPTTABLE_PAGE_MF_COLMOVE,878582386,
 sw_MetricField_TP_OPTTABLE_PAGE_MF_ROWINSERT,878582389,
@@ -8500,9 +8494,6 @@ sw_RadioButton_TP_LAB_LAB_BTN_CONT,909689353,
 sw_RadioButton_TP_LAB_LAB_BTN_SHEET,909689354,
 sw_RadioButton_TP_LAB_PRT_BTN_PAGE,909722113,
 sw_RadioButton_TP_LAB_PRT_BTN_SINGLE,909722114,
-sw_RadioButton_TP_OPTLOAD_PAGE_RB_ALWAYS,878969356,
-sw_RadioButton_TP_OPTLOAD_PAGE_RB_NEVER,878969358,
-sw_RadioButton_TP_OPTLOAD_PAGE_RB_REQUEST,878969357,
 sw_RadioButton_TP_OPTSHDWCRSR_RB_SHDWCRSFILLINDENT,878805510,
 sw_RadioButton_TP_OPTSHDWCRSR_RB_SHDWCRSFILLMARGIN,878805509,
 sw_RadioButton_TP_OPTSHDWCRSR_RB_SHDWCRSFILLSPACE,878805512,
diff --git a/source/text/shared/optionen/01040900.xhp 
b/source/text/shared/optionen/01040900.xhp
index e41c7b3..a87b045 100644
--- a/source/text/shared/optionen/01040900.xhp
+++ b/source/text/shared/optionen/01040900.xhp
@@ -43,8 +43,8 @@
 tab stops; spacing in text documents
 spacing; tab stops in text documents
 
-General
-Specifies general settings for text 
documents.
+General
+Specifies general 
settings for text documents.
 
 
   
@@ -53,22 +53,22 @@
 Update
 Update links when loading
 
-Always
-Always 
updates links while loading a document.
+Always
+Always 
updates links while loading a document.
 
-On request
-Updates 
links only on request while loading a document.
+On request
+Updates 
links only on request while loading a document.
 
-Never
-Links are 
never updated while loading a document.
+Never
+Links are 
never updated while loading a document.
 
 Automatically
 
 To update 
fields manuallyi81240
 
 
-Fields
-The 
contents of all fields are updated automatically whenever the screen contents 
are displayed as new. Even with this box unchecked, some fields are updated 
each time a special condition takes place. The following table lists 
the fields that are updated without regard to this checkbox.
+Fields
+The 
contents of all fields are updated automatically whenever the screen contents 
are displayed as new. Even with this box unchecked, some fields are updated 
each time a special condition takes place. The following table lists 
the fields that are updated without regard to this checkbox.
 
 
 
@@ -135,16 +135,16 @@
 
 
 
-Charts
-Specifies whether to 
automatically update charts. Whenever a Writer table cell value changes and the 
cursor leaves that cell, the chart that displays the cell value is updated 
automatically.see message "[sw-features] changed/CWS 
chart2mst3 : Automatic update for charts in Writer" by Thomas 
Lange
+Charts
+Specifies whether to 
automatically update charts. Whenever a Writer table cell value changes and the 
cursor leaves that cell, the chart that displays the cell value is updated 
automatically.

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configure.ac

[Petr Mladek]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3dbbaea8aa5e56981acc90737237197511ddfdac
Author: Petr Mladek 
Date:   Thu Jul 4 10:02:02 2013 +0200

fixed product version to 4.1.1.0+

the extra 5th version number was there by mistake

Change-Id: I85c37dc10f5f3c3a8c09b9e89c34dce13be26e48

diff --git a/configure.ac b/configure.ac
index b4ce4a2..844b49c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.1.1.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 save_CC=$CC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - configure.ac

[Petr Mladek]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6dde9fa9f56272d4a67f5e0e30c4cb8ca172
Author: Petr Mladek 
Date:   Thu Jul 4 10:04:58 2013 +0200

fixed product version to 4.1.0.2+

the extra 5th version number was there by mistake

Change-Id: I556fc302bdec80ba51da598eb6101dd04c2987a1

diff --git a/configure.ac b/configure.ac
index df40096..711ecc6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.1.0.2.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.0.2+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 save_CC=$CC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Build breakage in master on OSX with openclwrapper.cxx

[Tor Lillqvist]

It is hopefully fixed already, just try again. The intent is that the
OpenCL code is by default built for the Mac, as there is no need for any
separate "SDK" for it, it is included in the normal OS X SDK. Just that the
10.6 SDK has a slightly older version of the OpenCL API than that against
which the OpenCL code we have was written.

--tml
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/qa writerfilter/source

[Adam Co]

 sw/qa/extras/ooxmlexport/data/fdo66543.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx |   12 
 writerfilter/source/dmapper/DomainMapper.cxx |   14 +-
 writerfilter/source/dmapper/PropertyMap.cxx  |2 +-
 4 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 7baf286555396416ac30a473dd1e50a878cef011
Author: Adam Co 
Date:   Wed Jul 3 12:28:12 2013 +0300

fdo#66543: fixed line number attribute START VALUE wasnt imported and 
exported

Change-Id: I09e0356f994f5eb328f741723ac7dbfea51419ed
Reviewed-on: https://gerrit.libreoffice.org/4693

diff --git a/sw/qa/extras/ooxmlexport/data/fdo66543.docx 
b/sw/qa/extras/ooxmlexport/data/fdo66543.docx
new file mode 100644
index 000..585eb41
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo66543.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index db12382..8447081 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -85,6 +86,7 @@ public:
 void testFdo64238_b();
 void testFdo56679();
 void testFdo65400();
+void testFdo66543();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -144,6 +146,7 @@ void Test::run()
 {"fdo64238_b.docx", &Test::testFdo64238_b},
 {"fdo56679.docx", &Test::testFdo56679},
 {"fdo65400.docx", &Test::testFdo65400},
+{"fdo66543.docx", &Test::testFdo66543},
 };
 // Don't test the first import of these, for some reason those tests fail
 const char* aBlacklist[] = {
@@ -878,6 +881,15 @@ void Test::testFdo65400()
 CPPUNIT_ASSERT_EQUAL( sal_Int32( 0xd8d8d8 ), getProperty< sal_Int32 >( 
shaded, "CharBackColor" ));
 }
 
+void Test::testFdo66543()
+{
+// The problem was that when importing DOCX with 'line numbers' - the 
'start value' was imported
+// but nothing was done with it.
+
+uno::Reference< text::XTextRange > paragraph1 = getParagraph( 1 );
+CPPUNIT_ASSERT_EQUAL( sal_Int32( 1 ), getProperty< sal_Int32 >( 
paragraph1, "ParaLineNumberStartValue" ));
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index c7bc9d3..de0783b 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1376,16 +1376,28 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 {
 case NS_ooxml::LN_CT_LineNumber_countBy:
 aSettings.nInterval = nIntValue;
+OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
+if( pSectionContext )
+pSectionContext->SetLnnMod( nIntValue );
 break;
 case NS_ooxml::LN_CT_LineNumber_start:
 aSettings.nStartValue = nIntValue; // todo: has to be set 
at (each) first paragraph
+OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
+if( pSectionContext )
+pSectionContext->SetLnnMin( nIntValue );
 break;
 case NS_ooxml::LN_CT_LineNumber_distance:
 aSettings.nDistance = 
ConversionHelper::convertTwipToMM100( nIntValue );
+OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
+if( pSectionContext )
+pSectionContext->SetdxaLnn( nIntValue );
 break;
 case NS_ooxml::LN_CT_LineNumber_restart:
 //page:empty, probably 0,section:1,continuous:2;
 aSettings.bRestartAtEachPage = nIntValue < 1;
+OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
+if( pSectionContext )
+pSectionContext->SetLnc( nIntValue );
 break;
 default:;
 }
@@ -2537,7 +2549,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 case NS_sprm::LN_SLnnMin: // sprmSLnnMin
 OSL_ENSURE(pSectionContext, "SectionContext unavailable!");
 if( pSectionContext )
-pSectionContext->SetLnnMin( nIntValue );
+pSectionContext->SetLnnMin( nIntValue + 1 ); // Sending '+1' 
because the value of 'sprmSLnnMin' is one less than the starting value for line 
numbers.
 break;
 
 case NS_sprm::LN_SGprfIhdt:
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index a26fc18..cfa2d88 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -842,7 +842,7 @@ void SectionPropertyMap::CloseSectionGroup( 
DomainMapper_Impl& rDM

[Libreoffice-commits] core.git: bin/distro-install-file-lists

[Tomáš Chvátal]

 bin/distro-install-file-lists |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 90b836fc3ba19ef3bf638f0f122e2e050a6a2000
Author: Tomáš Chvátal 
Date:   Thu Jul 4 10:28:56 2013 +0200

Fix one more occurance of .uno.so

Change-Id: I1b1905a3eb7ab116eaaed5db37cff8e2bbe7456f

diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index 22b120f..ce67667 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -353,7 +353,7 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 
 # Put gtk/gnome stuff into gnome package
 mv_file_between_flists gnome_list.txt core_list.txt 
$INSTALLDIR/program/gnome-open-url.bin
-mv_file_between_flists gnome_list.txt core_list.txt 
$INSTALLDIR/program/ucpgvfs1.uno.so
+mv_file_between_flists gnome_list.txt core_list.txt 
$INSTALLDIR/program/ucpgvfs1lo.so
 
 # Ship ooqstart for gnome in gnome package
 mv_file_between_flists gnome_list.txt core_list.txt 
"$INSTALLDIR/program/libqstart_gtk680.*"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-0' - configure.ac

[Petr Mladek]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2a19bc471c9e19f79c2d4b821cd725515cfdaece
Author: Petr Mladek 
Date:   Thu Jul 4 10:30:25 2013 +0200

Revert "fixed product version to 4.1.0.2+"

It was actually on purpose because the "+" in the 4th version number
caused a build crash.

This reverts commit 6dde9fa9f56272d4a67f5e0e30c4cb8ca172.

diff --git a/configure.ac b/configure.ac
index 711ecc6..df40096 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.1.0.2+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.0.2.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 save_CC=$CC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configure.ac

[Petr Mladek]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 807145996b34bc1ba42c80d6e707ff19769f4c10
Author: Petr Mladek 
Date:   Thu Jul 4 10:32:44 2013 +0200

Revert "fixed product version to 4.1.1.0+"

It was actually on purpose because the "+" in the 4th version number
caused a build crash.

This reverts commit 3dbbaea8aa5e56981acc90737237197511ddfdac.

diff --git a/configure.ac b/configure.ac
index 844b49c..b4ce4a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[4.1.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.1.1.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 save_CC=$CC
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: writerfilter/source

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx |   14 +--
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   28 +++---
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|   10 +-
 writerfilter/source/dmapper/PropertyMap.cxx  |   70 +++
 writerfilter/source/dmapper/PropertyMap.hxx  |6 -
 writerfilter/source/dmapper/SdtHelper.cxx|4 
 writerfilter/source/dmapper/StyleSheetTable.cxx  |8 -
 7 files changed, 69 insertions(+), 71 deletions(-)

New commits:
commit 25bfc4a4e6fd34c10d352c87e38e36c9303edfd2
Author: Miklos Vajna 
Date:   Thu Jul 4 10:30:42 2013 +0200

writerfilter::dmapper::PropertyDefinition::bIsTextProperty is never read

Change-Id: I9d0ce39c1c47d8b89bd675ce91f6cfe2e9c3a061

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index de0783b..4a932d5 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -988,7 +988,7 @@ void DomainMapper::lcl_attribute(Id nName, Value & val)
 PropertyMap::iterator aLineSpacingIter;
 if (pTopContext)
 {
-aLineSpacingIter = pTopContext->find(PropertyDefinition( 
PROP_PARA_LINE_SPACING, true ) );
+aLineSpacingIter = pTopContext->find(PropertyDefinition( 
PROP_PARA_LINE_SPACING ) );
 bFound = aLineSpacingIter != pTopContext->end();
 }
 if (bFound)
@@ -1521,7 +1521,7 @@ sal_Int32 
lcl_getCurrentNumberingProperty(uno::Referencefind( 
PropertyDefinition( PROP_WRITING_MODE, false ));
+PropertyMap::const_iterator aPropParaIte = rContext->find( 
PropertyDefinition( PROP_WRITING_MODE ));
 if( aPropParaIte != rContext->end())
 {
 sal_Int32 aAdjust ;
@@ -1609,7 +1609,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 uno::Any aRules = uno::makeAny( pList->GetNumberingRules( 
) );
 rContext->Insert( PROP_NUMBERING_RULES, true, aRules );
 // erase numbering from pStyle if already set
-rContext->erase( PropertyDefinition( 
PROP_NUMBERING_STYLE_NAME, true ));
+rContext->erase( PropertyDefinition( 
PROP_NUMBERING_STYLE_NAME ));
 }
 }
 else
@@ -3089,7 +3089,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 m_pImpl->GetTopContext()->Insert( PROP_PARA_STYLE_NAME, true, 
uno::makeAny( sConvertedStyleName ));
 //apply numbering to paragraph if it was set at the style, but only if 
the paragraph itself
 //does not specify the numbering
-if( rContext->find( PropertyDefinition( PROP_NUMBERING_RULES, true )) 
== rContext->end()) // !contains
+if( rContext->find( PropertyDefinition( PROP_NUMBERING_RULES )) == 
rContext->end()) // !contains
 {
 const StyleSheetEntryPtr pEntry = 
pStyleTable->FindStyleSheetByISTD(sStringValue);
 OSL_ENSURE( pEntry.get(), "no style sheet found" );
@@ -3106,8 +3106,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext, SprmType
 {
 const StyleSheetEntryPtr pParent = 
pStyleTable->FindStyleSheetByISTD(pEntry->sBaseStyleIdentifier);
 const StyleSheetPropertyMap* pParentProperties = 
dynamic_cast(pParent ? pParent->pProperties.get() 
: 0);
-if (pParentProperties->find( PropertyDefinition( 
PROP_PARA_RIGHT_MARGIN, true )) != pParentProperties->end())
-nParaRightMargin = pParentProperties->find( 
PropertyDefinition( PROP_PARA_RIGHT_MARGIN, true ))->second.get();
+if (pParentProperties->find( PropertyDefinition( 
PROP_PARA_RIGHT_MARGIN )) != pParentProperties->end())
+nParaRightMargin = pParentProperties->find( 
PropertyDefinition( PROP_PARA_RIGHT_MARGIN ))->second.get();
 }
 if (nParaRightMargin != 0)
 {
@@ -3426,7 +3426,7 @@ void DomainMapper::processDeferredCharacterProperties( 
const std::map< sal_Int32
 {
 std::map< sal_Int32, uno::Any >::const_iterator font = 
deferredCharacterProperties.find( NS_sprm::LN_CHps );
 PropertyMapPtr pDefaultCharProps = 
m_pImpl->GetStyleSheetTable()->GetDefaultCharProps();
-PropertyMap::iterator aDefaultFont = 
pDefaultCharProps->find(PropertyDefinition( PROP_CHAR_HEIGHT, false ));
+PropertyMap::iterator aDefaultFont = 
pDefaultCharProps->find(PropertyDefinition( PROP_CHAR_HEIGHT ));
 if( font != deferredCharacterProperties.end())
 {
 double fontSize = 0;
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperT

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 3c/7eb23c2a3beff216f58e2376030f9b4c80087e 83/87a0d5d26e0e327097ec91dfc66173c4de24d1

[Caolán McNamara]

 3c/7eb23c2a3beff216f58e2376030f9b4c80087e |1 +
 83/87a0d5d26e0e327097ec91dfc66173c4de24d1 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit a80a1392ea4b84a76562e3e081c7e00980ddd6e2
Author: Caolán McNamara 
Date:   Thu Jul 4 09:45:56 2013 +0100

Notes added by 'git notes add'

diff --git a/83/87a0d5d26e0e327097ec91dfc66173c4de24d1 
b/83/87a0d5d26e0e327097ec91dfc66173c4de24d1
new file mode 100644
index 000..a4f2907
--- /dev/null
+++ b/83/87a0d5d26e0e327097ec91dfc66173c4de24d1
@@ -0,0 +1 @@
+ignore: obsolete, rerun windows 8 validation tooling
commit ce18bc59611da17b3735d15acc9dc44a4990a850
Author: Caolán McNamara 
Date:   Thu Jul 4 09:45:42 2013 +0100

Notes added by 'git notes add'

diff --git a/3c/7eb23c2a3beff216f58e2376030f9b4c80087e 
b/3c/7eb23c2a3beff216f58e2376030f9b4c80087e
new file mode 100644
index 000..a4f2907
--- /dev/null
+++ b/3c/7eb23c2a3beff216f58e2376030f9b4c80087e
@@ -0,0 +1 @@
+ignore: obsolete, rerun windows 8 validation tooling
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: oox/source sw/qa writerfilter/source

[Miklos Vajna]

 oox/source/vml/vmlshape.cxx   |   14 ++
 sw/qa/extras/ooxmlimport/data/n820504.docx|binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |8 +++-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
 4 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit f5b7acac624f07fa95835b6054b8d295901bb1dd
Author: Miklos Vajna 
Date:   Thu Jul 4 10:55:50 2013 +0200

bnc#820504 VML import: don't anchor shapes TO_PAGE

In theory, this is a problem because Word formats only support AT_CHAR
and AS_CHAR, so importing something as AT_PAGE is buggy.

In practice, this also leads to unvisible shapes, since
f0d001a378c64ea457e722266e60c96522c72e9b.

Change-Id: Ie730d67a789ef12734cede1f9b6c27764a66f237

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index f95b7e1..efd5d75 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -456,18 +456,8 @@ void lcl_SetAnchorType(PropertySet& rPropSet, const 
ShapeTypeModel& rTypeModel)
 
 if ( rTypeModel.maPosition == "absolute" )
 {
-if (rTypeModel.moWrapAnchorX.get() == "page" && 
rTypeModel.moWrapAnchorY.get() == "page")
-{
-// I'm not sure if AT_PAGE is always correct here (not sure what 
the parent that
-// the spec talks about can be), but with Writer SwXDrawPage::add()
-// always in practice uses this because of 
pDoc->GetCurrentLayout() being NULL at this point.
-rPropSet.setProperty(PROP_AnchorType, 
text::TextContentAnchorType_AT_PAGE);
-}
-else
-{
-// Map to as-character by default, that fixes vertical position of 
some textframes.
-rPropSet.setProperty(PROP_AnchorType, 
text::TextContentAnchorType_AT_CHARACTER);
-}
+// Word supports as-character (inline) and at-character only, absolute 
can't be inline.
+rPropSet.setProperty(PROP_AnchorType, 
text::TextContentAnchorType_AT_CHARACTER);
 
 if ( rTypeModel.maPositionVerticalRelative == "page" )
 {
diff --git a/sw/qa/extras/ooxmlimport/data/n820504.docx 
b/sw/qa/extras/ooxmlimport/data/n820504.docx
index 36279a9..3cc2bfa 100644
Binary files a/sw/qa/extras/ooxmlimport/data/n820504.docx and 
b/sw/qa/extras/ooxmlimport/data/n820504.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index d53094e..6d036a8 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -532,7 +532,7 @@ void Test::testN764005()
 CPPUNIT_ASSERT(eValue != text::TextContentAnchorType_AS_CHARACTER);
 sal_Bool bValue = sal_True;
 xPropertySet->getPropertyValue("Opaque") >>= bValue;
-CPPUNIT_ASSERT_EQUAL(sal_False, bValue);
+CPPUNIT_ASSERT_EQUAL(false, bool(bValue));
 }
 
 void Test::testSmartart()
@@ -1455,6 +1455,12 @@ void Test::testN820504()
 uno::Reference 
xStyle(xStylesAccess->getByName("Default Style"), uno::UNO_QUERY);
 // The problem was that the CharColor was set to AUTO (-1) even if we have 
some default char color set
 CPPUNIT_ASSERT_EQUAL(sal_Int32(4040635), getProperty(xStyle, 
"CharColor"));
+
+// Also, the groupshape was anchored at-page instead of at-character
+// (that's incorrect as Word only supports at-character and as-character).
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, 
getProperty(xDraws->getByIndex(0), "AnchorType"));
 }
 
 void Test::testFdo43641()
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index af47f15..ded3f89 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1749,7 +1749,7 @@ void DomainMapper_Impl::PushShapeContext( const 
uno::Reference< drawing::XShape
 if (nAnchorType == text::TextContentAnchorType_AT_PAGE)
 bIsGraphic = false;
 
-if (nAnchorType != text::TextContentAnchorType_AT_PAGE)
+if (!m_bInHeaderFooterImport)
 xProps->setPropertyValue(
 rPropNameSupplier.GetName( PROP_OPAQUE ),
 uno::makeAny( true ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/inc filter/source filter/uiconfig filter/UIConfig_xsltdlg.mk

[Caolán McNamara]

 filter/UIConfig_xsltdlg.mk|1 
 filter/inc/filter.hrc |1 
 filter/source/pdf/impdialog.cxx   |  136 ---
 filter/source/pdf/impdialog.hrc   |   55 
 filter/source/pdf/impdialog.hxx   |   40 +--
 filter/source/pdf/impdialog.src   |  165 -
 filter/uiconfig/ui/pdfviewpage.ui |  464 ++
 7 files changed, 543 insertions(+), 319 deletions(-)

New commits:
commit 1e467c8b38b4308af48a7dd4e34888bbd935bfc5
Author: Caolán McNamara 
Date:   Thu Jul 4 09:28:59 2013 +0100

convert pdf view page to .ui format

Change-Id: I738dd72f66658f60025152c9c3db765dbcb981ac

diff --git a/filter/UIConfig_xsltdlg.mk b/filter/UIConfig_xsltdlg.mk
index d474ec5..6cb146c 100644
--- a/filter/UIConfig_xsltdlg.mk
+++ b/filter/UIConfig_xsltdlg.mk
@@ -13,6 +13,7 @@ $(eval $(call gb_UIConfig_add_uifiles,filter,\
 filter/uiconfig/ui/pdflinkspage \
 filter/uiconfig/ui/pdfsecuritypage \
 filter/uiconfig/ui/pdfuserinterfacepage \
+filter/uiconfig/ui/pdfviewpage \
filter/uiconfig/ui/testxmlfilter \
filter/uiconfig/ui/xmlfiltersettings \
 ))
diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc
index ec5879b..8077a81 100644
--- a/filter/inc/filter.hrc
+++ b/filter/inc/filter.hrc
@@ -32,7 +32,6 @@
 // warning, next range is RID_FILTER_START + 100 !
 
 #define HID_FILTER_PDF_OPTIONS  "HID_FILTER_PDF_OPTIONS"
-#define HID_FILTER_PDF_INITIAL_VIEW   "HID_FILTER_PDF_INITIAL_VIEW"
 #define HID_FILTER_PDF_SIGNING"HID_FILTER_PDF_SIGNING"
 
 #endif
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 73b6592..d4d43be 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -822,47 +822,33 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl)
 return 0;
 }
 
-/
 // the option features tab page
-// 
-
-ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage( Window* pParent,
-  const SfxItemSet& rCoreSet ) :
-SfxTabPage( pParent, PDFFilterResId( RID_PDF_TAB_OPNFTR ), rCoreSet ),
-
-maFlInitialView( this, PDFFilterResId( FL_INITVIEW ) ),
-maRbOpnPageOnly( this, PDFFilterResId( RB_OPNMODE_PAGEONLY ) ),
-maRbOpnOutline( this, PDFFilterResId( RB_OPNMODE_OUTLINE ) ),
-maRbOpnThumbs( this, PDFFilterResId( RB_OPNMODE_THUMBS ) ),
-maFtInitialPage( this, PDFFilterResId( FT_MAGNF_INITIAL_PAGE ) ),
-maNumInitialPage( this, PDFFilterResId( NUM_MAGNF_INITIAL_PAGE ) ),
-
-maFlMagnification( this, PDFFilterResId( FL_MAGNIFICATION ) ),
-maRbMagnDefault( this, PDFFilterResId( RB_MAGNF_DEFAULT ) ),
-maRbMagnFitWin( this, PDFFilterResId( RB_MAGNF_WIND ) ),
-maRbMagnFitWidth( this, PDFFilterResId( RB_MAGNF_WIDTH ) ),
-maRbMagnFitVisible( this, PDFFilterResId( RB_MAGNF_VISIBLE ) ),
-maRbMagnZoom( this, PDFFilterResId( RB_MAGNF_ZOOM ) ),
-maNumZoom( this, PDFFilterResId( NUM_MAGNF_ZOOM ) ),
-
-m_aVerticalLine(this, PDFFilterResId(FL_INITVIEW_VERTICAL)),
-
-maFlPageLayout( this, PDFFilterResId( FL_PAGE_LAYOUT ) ),
-maRbPgLyDefault( this, PDFFilterResId( RB_PGLY_DEFAULT ) ),
-maRbPgLySinglePage( this, PDFFilterResId( RB_PGLY_SINGPG ) ),
-maRbPgLyContinue( this, PDFFilterResId( RB_PGLY_CONT ) ),
-maRbPgLyContinueFacing( this, PDFFilterResId( RB_PGLY_CONTFAC ) ),
-maCbPgLyFirstOnLeft( this, PDFFilterResId( CB_PGLY_FIRSTLEFT ) ),
-mbUseCTLFont( sal_False )
+ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage(Window* pParent, const SfxItemSet& 
rCoreSet)
+: SfxTabPage(pParent, "PdfViewPage","filter/ui/pdfviewpage.ui", rCoreSet)
+, mbUseCTLFont(false)
 {
-FreeResource();
-
-maRbMagnDefault.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
-maRbMagnFitWin.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
-maRbMagnFitWidth.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
-maRbMagnFitVisible.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
-maRbMagnZoom.SetToggleHdl( LINK( this, ImpPDFTabOpnFtrPage, 
ToggleRbMagnHdl ) );
-maNumZoom.SetAccessibleName(maRbMagnZoom.GetText());
-maNumZoom.SetAccessibleRelationLabeledBy(&maRbMagnZoom);
+get(mpRbOpnPageOnly, "pageonly");
+get(mpRbOpnOutline, "outline");
+get(mpRbOpnThumbs, "thumbs");
+get(mpNumInitialPage, "page");
+get(mpRbMagnDefault, "fitdefault");
+get(mpRbMagnFitWin, "fitwin");
+get(mpRbMagnFitWidth, "fitwidth");
+get(mpRbMagnFitVisible, "fitvis");
+get(mpRbMagnZoom, "fitzoom");
+get(mpNumZoom, "zoom");
+get(mpRbPgLyDefault, "defaultlayout");
+get(mpRbPgLySinglePage, "singlelayout");
+get(mpRbPgLyContinue, "contlayout");
+get(mpRbPgLyContinueFacing, "contfacinglayout");
+get(mpCbPgLyFirstOnLeft, "firstonleft");
+
+ 

[Libreoffice-commits] core.git: helpcontent2

[Caolán McNamara]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b7151c4ac7e3f7bac4921ca7af07ffd862d808bb
Author: Caolán McNamara 
Date:   Thu Jul 4 10:30:10 2013 +0100

Updated core
Project: help  f1701b12193c153b6f7d7de018b871e6a05beedd

diff --git a/helpcontent2 b/helpcontent2
index 7de50a3..f1701b1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 7de50a3f88322f0de1f334c2811bcfd73d816cf5
+Subproject commit f1701b12193c153b6f7d7de018b871e6a05beedd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst |   16 ---
 source/text/shared/01/ref_pdf_export.xhp |   32 ---
 2 files changed, 17 insertions(+), 31 deletions(-)

New commits:
commit f1701b12193c153b6f7d7de018b871e6a05beedd
Author: Caolán McNamara 
Date:   Thu Jul 4 10:30:10 2013 +0100

update help ids for pdf view page .ui conversion

Change-Id: I760965834d6583f37b0eca7bf90b29bf96de14c6

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index cbd5724..74f1a52 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1738,7 +1738,6 @@ HID_FILL_ATTR_LISTBOX,39869,
 HID_FILL_TYPE_LISTBOX,39870,
 HID_FILTER_NAVIGATOR,38072,
 HID_FILTER_NAVIGATOR_WIN,38073,
-HID_FILTER_PDF_INITIAL_VIEW,64150,
 HID_FILTER_PDF_OPTIONS,64149,
 HID_FIRSTSTART_CANCEL,42781,
 HID_FIRSTSTART_FINISH,42782,
@@ -6255,33 +6254,18 @@ 
filter_CheckBox_RID_PDF_TAB_GENER_CB_EXPORTNOTES,867845138,
 filter_CheckBox_RID_PDF_TAB_GENER_CB_PDFA_1B_SELECT,867845145,
 filter_CheckBox_RID_PDF_TAB_GENER_CB_REDUCEIMAGERESOLUTION,867845134,
 filter_CheckBox_RID_PDF_TAB_GENER_CB_TAGGEDPDF,867845137,
-filter_CheckBox_RID_PDF_TAB_OPNFTR_CB_PGLY_FIRSTLEFT,867877986,
 filter_ComboBox_RID_PDF_TAB_GENER_CO_REDUCEIMAGERESOLUTION,867848207,
 filter_Edit_RID_PDF_TAB_GENER_ED_PAGES,867846149,
 filter_ListBox_RID_PDF_TAB_GENER_LB_FORMSFORMAT,867847702,
 filter_MetricField_RID_PDF_TAB_GENER_NF_QUALITY,867850765,
-filter_MetricField_RID_PDF_TAB_OPNFTR_NUM_MAGNF_ZOOM,867883610,
 filter_ModalDialog_DLG_OPTIONS,1090519040,
 filter_ModalDialog_RID_PDF_ERROR_DLG,1404878848,
 filter_NumericField_DLG_OPTIONS_NUM_FLD_QUALITY,1090525185,
-filter_NumericField_RID_PDF_TAB_OPNFTR_NUM_MAGNF_INITIAL_PAGE,867883100,
 filter_RadioButton_RID_PDF_TAB_GENER_RB_ALL,867844610,
 filter_RadioButton_RID_PDF_TAB_GENER_RB_JPEGCOMPRESSION,867844619,
 filter_RadioButton_RID_PDF_TAB_GENER_RB_LOSSLESSCOMPRESSION,867844618,
 filter_RadioButton_RID_PDF_TAB_GENER_RB_RANGE,867844611,
 filter_RadioButton_RID_PDF_TAB_GENER_RB_SELECTION,867844612,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_DEFAULT,867877461,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_VISIBLE,867877464,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_WIDTH,867877463,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_WIND,867877462,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_MAGNF_ZOOM,867877465,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_OPNMODE_OUTLINE,867877458,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_OPNMODE_PAGEONLY,867877457,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_OPNMODE_THUMBS,867877459,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_CONT,867877472,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_CONTFAC,867877473,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_DEFAULT,867877470,
-filter_RadioButton_RID_PDF_TAB_OPNFTR_RB_PGLY_SINGPG,867877471,
 formula_CheckBox_RID_FORMULADLG_FORMULA_BTN_MATRIX,2655437835,
 formula_CheckBox_RID_FORMULADLG_FORMULA_MODAL_BTN_MATRIX,1581728779,
 formula_Edit_RID_FORMULADLG_FORMULA_ED_REF,2655438867,
diff --git a/source/text/shared/01/ref_pdf_export.xhp 
b/source/text/shared/01/ref_pdf_export.xhp
index b3c98a1..fb777d7 100644
--- a/source/text/shared/01/ref_pdf_export.xhp
+++ b/source/text/shared/01/ref_pdf_export.xhp
@@ -122,52 +122,54 @@
 Export automatically inserted blank pages
   If switched on, automatically inserted blank pages 
are being exported to pdf file. This is best if you are printing the pdf file 
double-sided. Example: In a book a chapter paragraph style is set to always 
start with an odd numbered page. The previous chapter ends on an odd page. 
%PRODUCTNAME inserts an even numbered blank page. This option controls whether 
to export that even numbered page or not.
   Initial View tab
+  
   Panes
-
+
 Page only
   Select to generate a PDF file that shows only the 
page contents.
-
+
 Bookmarks and page
   Select to generate a PDF file that shows a bookmarks 
palette and the page contents.UFI: Adobe reader help names the 
panes as "palettes"
-
+
 Thumbnails and page
   Select to generate a PDF file that shows a thumbnails 
palette and the page contents.
-
+
 Open on page
   Select to show the given page when the reader opens 
the PDF file.
   Magnification
-
+
 Default
   Select to generate a PDF file that shows the page 
contents without zooming. If the reader software is configured to use a zoom 
factor by default, the page shows with that zoom factor.
-
+
 Fit in window
   Select to generate a PDF file that shows the page 
zoomed to fit entirely into the reader's window.
-
+
 Fit width
   Select to generate a PDF file that shows the page 
zoomed to fit the width of the reader's window.
-
+
 Fit visible
   Select to generate a PDF file that shows the text and 
graphics on the page zoomed to fit the width of the reader's 
window.
-
-
+
+
 Zoom factor
   Select a given zoom factor when the reader opens the 
PDF file.
   Page layout
-
+
 Default
   S

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - sysui/Package_osxicons.mk

[Norbert Thiebaud]

 sysui/Package_osxicons.mk |   49 ++
 1 file changed, 24 insertions(+), 25 deletions(-)

New commits:
commit 69876d6bdca0a527c4d10b9a3c724f5df9d035ec
Author: Norbert Thiebaud 
Date:   Thu Jul 4 04:42:05 2013 -0500

fdo#66100 : fix icons associations on MacOSX

Change-Id: Idbce5516f1cc59b8d1cc39ee0a0db2aad90e8074
Reviewed-on: https://gerrit.libreoffice.org/4714
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sysui/Package_osxicons.mk b/sysui/Package_osxicons.mk
index ed84e10..6f8ca5f 100644
--- a/sysui/Package_osxicons.mk
+++ b/sysui/Package_osxicons.mk
@@ -7,35 +7,34 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,sysui_osxicons,$(SRCDIR)/sysui/desktop))
+$(eval $(call gb_Package_Package,sysui_osxicons,$(SRCDIR)/sysui/desktop/icons))
 
 $(eval $(call gb_Package_set_outdir,sysui_osxicons,$(INSTDIR)))
 
 $(eval $(call gb_Package_add_files_with_dir,sysui_osxicons,Resources,\
-icons/text.icns \
-icons/oasis-text.icns \
-icons/spreadsheet.icns \
-icons/oasis-spreadsheet.icns \
-icons/presentation.icns \
-icons/oasis-presentation.icns \
-icons/drawing.icns \
-icons/oasis-drawing.icns \
-icons/master-document.icns \
-icons/oasis-master-document.icns \
-icons/formula.icns \
-icons/oasis-formula.icns \
-icons/text-template.icns \
-icons/oasis-text-template.icns \
-icons/spreadsheet-template.icns \
-icons/oasis-spreadsheet-template.icns \
-icons/presentation-template.icns \
-icons/oasis-presentation-template.icns \
-icons/drawing-template.icns \
-icons/oasis-drawing-template.icns \
-icons/oasis-database.icns \
-icons/extension.icns \
-icons/main.icns \
-   macosx/Info.plist \
+text.icns \
+oasis-text.icns \
+spreadsheet.icns \
+oasis-spreadsheet.icns \
+presentation.icns \
+oasis-presentation.icns \
+drawing.icns \
+oasis-drawing.icns \
+master-document.icns \
+oasis-master-document.icns \
+formula.icns \
+oasis-formula.icns \
+text-template.icns \
+oasis-text-template.icns \
+spreadsheet-template.icns \
+oasis-spreadsheet-template.icns \
+presentation-template.icns \
+oasis-presentation-template.icns \
+drawing-template.icns \
+oasis-drawing-template.icns \
+oasis-database.icns \
+extension.icns \
+main.icns \
 ))
 
 # vim: set ts=4 sw=4 et:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sysui/Package_osxicons.mk

[Norbert Thiebaud]

 sysui/Package_osxicons.mk |   49 ++
 1 file changed, 24 insertions(+), 25 deletions(-)

New commits:
commit e2f002c044243ddd79eea7837167a72c82b98599
Author: Norbert Thiebaud 
Date:   Thu Jul 4 04:42:05 2013 -0500

fdo#66100 : fix icons associations on MacOSX

Change-Id: Idbce5516f1cc59b8d1cc39ee0a0db2aad90e8074

diff --git a/sysui/Package_osxicons.mk b/sysui/Package_osxicons.mk
index ed84e10..6f8ca5f 100644
--- a/sysui/Package_osxicons.mk
+++ b/sysui/Package_osxicons.mk
@@ -7,35 +7,34 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,sysui_osxicons,$(SRCDIR)/sysui/desktop))
+$(eval $(call gb_Package_Package,sysui_osxicons,$(SRCDIR)/sysui/desktop/icons))
 
 $(eval $(call gb_Package_set_outdir,sysui_osxicons,$(INSTDIR)))
 
 $(eval $(call gb_Package_add_files_with_dir,sysui_osxicons,Resources,\
-icons/text.icns \
-icons/oasis-text.icns \
-icons/spreadsheet.icns \
-icons/oasis-spreadsheet.icns \
-icons/presentation.icns \
-icons/oasis-presentation.icns \
-icons/drawing.icns \
-icons/oasis-drawing.icns \
-icons/master-document.icns \
-icons/oasis-master-document.icns \
-icons/formula.icns \
-icons/oasis-formula.icns \
-icons/text-template.icns \
-icons/oasis-text-template.icns \
-icons/spreadsheet-template.icns \
-icons/oasis-spreadsheet-template.icns \
-icons/presentation-template.icns \
-icons/oasis-presentation-template.icns \
-icons/drawing-template.icns \
-icons/oasis-drawing-template.icns \
-icons/oasis-database.icns \
-icons/extension.icns \
-icons/main.icns \
-   macosx/Info.plist \
+text.icns \
+oasis-text.icns \
+spreadsheet.icns \
+oasis-spreadsheet.icns \
+presentation.icns \
+oasis-presentation.icns \
+drawing.icns \
+oasis-drawing.icns \
+master-document.icns \
+oasis-master-document.icns \
+formula.icns \
+oasis-formula.icns \
+text-template.icns \
+oasis-text-template.icns \
+spreadsheet-template.icns \
+oasis-spreadsheet-template.icns \
+presentation-template.icns \
+oasis-presentation-template.icns \
+drawing-template.icns \
+oasis-drawing-template.icns \
+oasis-database.icns \
+extension.icns \
+main.icns \
 ))
 
 # vim: set ts=4 sw=4 et:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] module sot: String, bool and other clean-up

[Fridrich Strba (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/4710

Approvals:
  LibreOffice gerrit bot: Verified
  Fridrich Strba: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/4710
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe2bfdf20c500e9fd98c3baef66d36aa79ca4b52
Gerrit-PatchSet: 2
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Norbert Thiebaud 
Gerrit-Reviewer: Fridrich Strba 
Gerrit-Reviewer: LibreOffice gerrit bot 

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara]

 vcl/source/window/builder.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit c104e2b661ec840951d39b5889495e2c42ff3d36
Author: Caolán McNamara 
Date:   Thu Jul 4 11:02:34 2013 +0100

fix %VARIABLE replacements in item lists

Change-Id: I94f129e26afdac9dc2e0d712c79d73142ced5eee

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 0993af9..95f0737 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2034,6 +2034,12 @@ std::vector 
VclBuilder::handleItems(xmlreader::XmlReader &reader, const
 if (!bTranslated)
 sValue = OString(name.begin, name.length);
 
+if (m_pStringReplace)
+{
+OUString sTmp = 
(*m_pStringReplace)(OStringToOUString(sValue, RTL_TEXTENCODING_UTF8));
+sValue = OUStringToOString(sTmp, RTL_TEXTENCODING_UTF8);
+}
+
 aItems.push_back(sValue);
 ++nItemIndex;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sot/source

[Caolán McNamara]

 sot/source/base/exchange.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c55a2bd33b00f92f795f4ee224c1887228c97b53
Author: Caolán McNamara 
Date:   Thu Jul 4 11:05:50 2013 +0100

fix build

Change-Id: I87ad4384b8898017d94f8e075d13545b7b4cfe50

diff --git a/sot/source/base/exchange.cxx b/sot/source/base/exchange.cxx
index 5b13c74..9765eb3 100644
--- a/sot/source/base/exchange.cxx
+++ b/sot/source/base/exchange.cxx
@@ -386,7 +386,7 @@ OUString SotExchange::GetFormatMimeType( sal_uLong nFormat )
 sMimeType = rL[ nFormat ]->MimeType;
 }
 
-DBG_ASSERT( sMimeType.Len(), "SotExchange::GetFormatMimeType(): DataFlavor 
not initialized" );
+DBG_ASSERT( !sMimeType.isEmpty(), "SotExchange::GetFormatMimeType(): 
DataFlavor not initialized" );
 
 return sMimeType;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - odk/docs sysui/desktop

[Jürgen Schmidt]

 odk/docs/images/ooo-main-app_32.png |binary
 sysui/desktop/icons/main.icns   |binary
 2 files changed

New commits:
commit 0e0c8e770a166ad51ca13ae422fdb3c89ccc98fe
Author: Jürgen Schmidt 
Date:   Thu Jul 4 09:45:22 2013 +

#122620# main aoo icon for Mac OS

diff --git a/sysui/desktop/icons/main.icns b/sysui/desktop/icons/main.icns
index 8357c09..df341eb9 100755
Binary files a/sysui/desktop/icons/main.icns and 
b/sysui/desktop/icons/main.icns differ
commit 431e6e6a434a9c28bdef47bede3b139ea461c456
Author: Jürgen Schmidt 
Date:   Thu Jul 4 09:32:45 2013 +

#122620# update oo icon image

diff --git a/odk/docs/images/ooo-main-app_32.png 
b/odk/docs/images/ooo-main-app_32.png
old mode 100644
new mode 100755
index 296c6f4..5f07799
Binary files a/odk/docs/images/ooo-main-app_32.png and 
b/odk/docs/images/ooo-main-app_32.png differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk

[Csikós Tamás]

 cui/UIConfig_cui.mk|1 
 cui/source/options/opthtml.cxx |  204 ++--
 cui/source/options/opthtml.hxx |   44 +-
 cui/uiconfig/ui/opthtmlpage.ui |  647 +
 4 files changed, 760 insertions(+), 136 deletions(-)

New commits:
commit 1be8236b688617f93cfaf23fe647632ce53b5ff1
Author: Csikós Tamás 
Date:   Wed Jul 3 16:42:23 2013 +0200

modern widgetlayout for opthtml

Change-Id: Ibad69d5d9512c1199c6cca3930c1b04f0af4987c
Reviewed-on: https://gerrit.libreoffice.org/4707
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 4ef51d6..2f30c25 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -49,6 +49,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optfltrpage \
cui/uiconfig/ui/optfontspage \
cui/uiconfig/ui/optgeneralpage \
+cui/uiconfig/ui/opthtmlpage \
cui/uiconfig/ui/optjsearchpage \
cui/uiconfig/ui/optlanguagespage \
cui/uiconfig/ui/optmemorypage \
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 9993030..5f53228 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -20,7 +20,6 @@
 #include 
 #include 
 #include "opthtml.hxx"
-#include "opthtml.hrc"
 #include 
 #include "helpid.hrc"
 #include 
@@ -44,40 +43,27 @@ const sal_uInt16 aExportToPosArr[] =
 // ---
 
 OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const SfxItemSet& rSet) :
-SfxTabPage( pParent, CUI_RES( RID_OFAPAGE_HTMLOPT ), rSet ),
-aFontSizeGB ( this, CUI_RES( GB_FONTSIZE   ) ),
-aSize1FT( this, CUI_RES( FT_SIZE1  ) ),
-aSize1NF( this, CUI_RES( NF_SIZE1  ) ),
-aSize2FT( this, CUI_RES( FT_SIZE2  ) ),
-aSize2NF( this, CUI_RES( NF_SIZE2  ) ),
-aSize3FT( this, CUI_RES( FT_SIZE3  ) ),
-aSize3NF( this, CUI_RES( NF_SIZE3  ) ),
-aSize4FT( this, CUI_RES( FT_SIZE4  ) ),
-aSize4NF( this, CUI_RES( NF_SIZE4  ) ),
-aSize5FT( this, CUI_RES( FT_SIZE5  ) ),
-aSize5NF( this, CUI_RES( NF_SIZE5  ) ),
-aSize6FT( this, CUI_RES( FT_SIZE6  ) ),
-aSize6NF( this, CUI_RES( NF_SIZE6  ) ),
-aSize7FT( this, CUI_RES( FT_SIZE7  ) ),
-aSize7NF( this, CUI_RES( NF_SIZE7  ) ),
-aImportGB   ( this, CUI_RES( GB_IMPORT ) ),
-aNumbersEnglishUSCB ( this, CUI_RES( CB_NUMBERS_ENGLISH_US ) ),
-aUnknownTagCB   ( this, CUI_RES( CB_UNKNOWN_TAGS ) ),
-aIgnoreFontNamesCB( this, CUI_RES( CB_IGNORE_FONTNAMES ) ),
-aExportGB   ( this, CUI_RES( GB_EXPORT   ) ),
-aExportLB   ( this, CUI_RES( LB_EXPORT   ) ),
-aStarBasicCB( this, CUI_RES( CB_STARBASIC) ),
-aStarBasicWarningCB(this, CUI_RES( CB_STARBASIC_WARNING) ),
-aPrintExtensionCB( this,CUI_RES(CB_PRINT_EXTENSION )),
-aSaveGrfLocalCB ( this, CUI_RES( CB_LOCAL_GRF) ),
-aCharSetFT  ( this, CUI_RES( FT_CHARSET  ) ),
-aCharSetLB  ( this, CUI_RES( LB_CHARSET  ) )
-
+SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", rSet )
 {
-FreeResource();
+get(aSize1NF,"size1");
+get(aSize2NF,"size2");
+get(aSize3NF,"size3");
+get(aSize4NF,"size4");
+get(aSize5NF,"size5");
+get(aSize6NF,"size6");
+get(aSize7NF,"size7");
+get(aNumbersEnglishUSCB,"numbersenglishus");
+get(aUnknownTagCB,"unknowntag");
+get(aIgnoreFontNamesCB,"ignorefontnames");
+get(aExportLB,"export");
+get(aStarBasicCB,"starbasic");
+get(aStarBasicWarningCB,"starbasicwarning");
+get(aPrintExtensionCB,"printextension");
+get(aSaveGrfLocalCB,"savegrflocal");
+get(aCharSetLB,"charset");
 
 // replace placeholder with UI string from language list
-String aText( aNumbersEnglishUSCB.GetText());
+/*String aText( aNumbersEnglishUSCB->GetText());
 String aPlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%ENGLISHUSLOCALE"));
 xub_StrLen nPos;
 if ((nPos = aText.Search( aPlaceholder)) != STRING_NOTFOUND)
@@ -87,15 +73,15 @@ OfaHtmlTabPage::OfaHtmlTabPage(Window* pParent, const 
SfxItemSet& rSet) :
 if (rStr.Len())
 {
 aText.Replace( nPos, aPlaceholder.Len(), rStr);
-aNumbersEnglishUSCB.SetText( aText);
+aNumbersEnglishUSCB->SetText( aText);
 }
-}
+}*/
 
-aExportLB.SetSelectHdl(LINK(this, OfaHtmlTabPage, ExportHdl_Impl));
-aStarBasicCB.SetClickHdl(LINK(this, OfaHtmlTabPage, CheckBoxHdl_Impl));
+aExportLB->SetSelectHdl(LINK(this, OfaHtmlTabPage, ExportHdl_Impl));
+aStarBasicCB->SetClickHdl(LINK(this, OfaHtmlTabPage, CheckBoxHdl_Impl));
 
 // initialize the characterset listbox

[Libreoffice-commits] core.git: cui/source cui/uiconfig cui/UIConfig_cui.mk

[Caolán McNamara]

 cui/UIConfig_cui.mk|2 
 cui/source/options/opthtml.cxx |5 
 cui/uiconfig/ui/opthtmlpage.ui |  271 ++---
 3 files changed, 126 insertions(+), 152 deletions(-)

New commits:
commit cf2b27494c67ea15be99140ef9cde38d646fd8f9
Author: Caolán McNamara 
Date:   Thu Jul 4 11:01:32 2013 +0100

some small tweaks to the html ui conversion

restore the %PRODUCTNAME and %LOCALE variables

Change-Id: I2b2e62ac3dd5c1117085f96f4541218bf1100647

diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 2f30c25..c21e556 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -49,7 +49,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optfltrpage \
cui/uiconfig/ui/optfontspage \
cui/uiconfig/ui/optgeneralpage \
-cui/uiconfig/ui/opthtmlpage \
+   cui/uiconfig/ui/opthtmlpage \
cui/uiconfig/ui/optjsearchpage \
cui/uiconfig/ui/optlanguagespage \
cui/uiconfig/ui/optmemorypage \
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 5f53228..7651a1e 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -61,9 +61,10 @@ SfxTabPage( pParent, "OptHtmlPage" , 
"cui/ui/opthtmlpage.ui", rSet )
 get(aPrintExtensionCB,"printextension");
 get(aSaveGrfLocalCB,"savegrflocal");
 get(aCharSetLB,"charset");
+aCharSetLB->SetStyle(aCharSetLB->GetStyle() | WB_SORT);
 
 // replace placeholder with UI string from language list
-/*String aText( aNumbersEnglishUSCB->GetText());
+String aText( aNumbersEnglishUSCB->GetText());
 String aPlaceholder( RTL_CONSTASCII_USTRINGPARAM( "%ENGLISHUSLOCALE"));
 xub_StrLen nPos;
 if ((nPos = aText.Search( aPlaceholder)) != STRING_NOTFOUND)
@@ -75,7 +76,7 @@ SfxTabPage( pParent, "OptHtmlPage" , "cui/ui/opthtmlpage.ui", 
rSet )
 aText.Replace( nPos, aPlaceholder.Len(), rStr);
 aNumbersEnglishUSCB->SetText( aText);
 }
-}*/
+}
 
 aExportLB->SetSelectHdl(LINK(this, OfaHtmlTabPage, ExportHdl_Impl));
 aStarBasicCB->SetClickHdl(LINK(this, OfaHtmlTabPage, CheckBoxHdl_Impl));
diff --git a/cui/uiconfig/ui/opthtmlpage.ui b/cui/uiconfig/ui/opthtmlpage.ui
index 5672399..ea6fb99 100644
--- a/cui/uiconfig/ui/opthtmlpage.ui
+++ b/cui/uiconfig/ui/opthtmlpage.ui
@@ -1,6 +1,7 @@
 
 
   
+  
   
 1
 50
@@ -53,13 +54,13 @@
   
 True
 False
-12
+6
 12
 
   
 True
 False
-6
+True
 vertical
 12
 
@@ -90,6 +91,7 @@
 True
 False
 Size 
_7
+True
 size7
   
   
@@ -119,6 +121,7 @@
 True
 False
 Size 
_6
+True
 size6
   
   
@@ -148,6 +151,7 @@
 True
 False
 Size 
_5
+True
 size5
   
   
@@ -177,6 +181,7 @@
 True
 False
 Size 
_4
+True
 size4
   
   
@@ -206,6 +211,7 @@
 True
 False
 Size 
_3
+True
 size3
   
   
@@ -235,6 +241,7 @@
 True
 False
 Size 
_2
+True
 size2
   
   
@@ -264,6 +271,7 @@
 True
 False
 Size 
_1
+True
 size1
   
   
@@ -298,7 +306,7 @@
 False
 Font sizes
 
-  
+  
 
   
 
@@ -310,12 +318,17 @@
   
 
   
+  
+False
+True
+0
+  
 
 
   
 True
 False
-12
+True
 vertical
 12
 
@@ -323,7 +336,6 @@
 True
 False
 True
-True
 0
 none
 
@@ -361,60 +373,64 @@
 
   
 _Import 
unknown HTML tags as fields
- True
- True
- False
- True
- True
-

[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source

[Caolán McNamara]

 cui/AllLangResTarget_cui.mk|1 
 cui/source/options/opthtml.hrc |   56 ---
 cui/source/options/opthtml.src |  295 -
 3 files changed, 352 deletions(-)

New commits:
commit 9e689ce13a43c536c17043e351dbdf5687fd32bc
Author: Caolán McNamara 
Date:   Thu Jul 4 11:21:44 2013 +0100

drop unused .src now

Change-Id: I6ec69375dc1023f6f899bc3bb46bccc47e508634

diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 5d80738..9a49234 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -57,7 +57,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
 cui/source/options/optdict.src \
 cui/source/options/optfltr.src \
 cui/source/options/optgdlg.src \
-cui/source/options/opthtml.src \
 cui/source/options/optinet2.src \
 cui/source/options/optjava.src \
 cui/source/options/optlingu.src \
diff --git a/cui/source/options/opthtml.hrc b/cui/source/options/opthtml.hrc
deleted file mode 100644
index 724248b..000
--- a/cui/source/options/opthtml.hrc
+++ /dev/null
@@ -1,56 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#ifndef _SVX_OPTHTML_HRC
-#define _SVX_OPTHTML_HRC
-
-// defines --
-
-#define GB_FONTSIZE 1
-#define FT_SIZE12
-#define NF_SIZE13
-#define FT_SIZE24
-#define NF_SIZE25
-#define FT_SIZE36
-#define NF_SIZE37
-#define FT_SIZE48
-#define NF_SIZE49
-#define FT_SIZE510
-#define NF_SIZE511
-#define FT_SIZE612
-#define NF_SIZE613
-#define FT_SIZE714
-#define NF_SIZE715
-#define GB_IMPORT   20
-#define CB_UNKNOWN_TAGS 21
-#define CB_IGNORE_FONTNAMES 22
-#define CB_NUMBERS_ENGLISH_US   23
-
-#define GB_EXPORT   30
-#define CB_STARBASIC31
-#define CB_STARBASIC_WARNING32
-
-#define CB_LOCAL_GRF37
-#define CB_PRINT_EXTENSION  38
-#define LB_EXPORT   39
-#define FT_CHARSET  40
-#define LB_CHARSET  41
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/options/opthtml.src b/cui/source/options/opthtml.src
deleted file mode 100644
index 425f91f..000
--- a/cui/source/options/opthtml.src
+++ /dev/null
@@ -1,295 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "opthtml.hrc"
-#include 
-
- // RID_OFAPAGE_HTMLOPT -
-TabPage RID_OFAPAGE_HTMLOPT
-{
-HelpID = "cui:TabPage:RID_OFAPAGE_HTMLOPT";
-OutputSize = TRUE ;
-Size = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-SVLook = TRUE ;
-Hide = TRUE ;
-FixedText FT_SIZE1
-{
-Pos = MAP_APPFONT ( 12 , 16 ) ;
-Size = MAP_APPFONT ( 30 , 8 ) ;
-Text [ en-US ] = "Size ~1" ;
-};
-NumericField NF_SIZE1
-{
-HelpID = "cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1";
-Pos = MAP_APPFONT ( 45 , 14 ) ;
-Size = MAP_APPFONT ( 30 , 12 ) ;
-Border = TRUE ;
-Tab

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - instsetoo_native/inc_openoffice instsetoo_native/util setup_native/source solenv/bin solenv/inc

[Andras Timar]

 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt |2 
 instsetoo_native/util/openoffice.lst   |   26 
+-
 setup_native/source/packinfo/finals_instsetoo.txt  |1 
 solenv/bin/modules/installer/globals.pm|2 
 solenv/inc/minor.mk|4 -
 5 files changed, 18 insertions(+), 17 deletions(-)

New commits:
commit f47f6e0dea37622735184f045c1dc70c0f8b8537
Author: Andras Timar 
Date:   Thu Jul 4 03:54:29 2013 -0700

enable MSP creation and bump version number for 1st PTF

Change-Id: I3f86bdf65f9cc38d4ae8b51afe5264e118132b39

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
index 828e80f..39b427e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -15,7 +15,7 @@ FileCost  400
 FindRelatedProductsNOT ISSETUPDRIVEN   100
 InstallFiles   1950
 InstallFinalize3150
-PatchInstall   PATCH   699
+PatchInstall   PATCH   49
 InstallInitialize  700
 InstallODBC2600
 InstallServicesVersionNT   2750
diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index 591b430..eb7aecd 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -30,10 +30,10 @@ Globals
 REGISTRYLAYERNAME Layers
 SERVICEPACK 1
 UPDATE_DATABASE 1
-CREATE_MSP_INSTALLSET 0
+CREATE_MSP_INSTALLSET 1
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 8
+WINDOWSPATCHLEVEL 6
 OOOVENDOR The Document Foundation
 OOODOWNLOADNAME 1
 BUILDIDCWS {buildidcws}
@@ -50,13 +50,13 @@ LibreOffice
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -6
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-304
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-306
 BASEPRODUCTVERSION 4.0
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -6
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-304
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-306
 BASEPRODUCTVERSION 4.0
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -161,7 +161,7 @@ URE
 PRODUCTVERSION 4.0
 PACKAGEVERSION 4.0
 PACKAGEREVISION 1
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -6
 BRANDPACKAGEVERSION 4.0
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
@@ -192,7 +192,7 @@ LibreOffice_SDK
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -6
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
@@ -231,7 +231,7 @@ LibreOffice_Dev_SDK
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -6
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -276,7 +276,7 @@ LibreOffice_Test
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -6
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
@@ -315,7 +315,7 @@ LibreOffice_Dev_Test
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -6
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
@@ -359,13 +359,13 @@ OxygenOffice
 {
 PRODUCTNAME OxygenOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -4
+PRODUCTEXTENSION -6
 POSTVERSIONEXTENSION
 

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-3.6' - instsetoo_native/util solenv/inc

[Andras Timar]

 instsetoo_native/util/openoffice.lst |8 
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 2b1ddc34e2a6ed7a92bb100d3338815d5447f6f2
Author: Andras Timar 
Date:   Thu Jul 4 13:04:42 2013 +0200

Bump for 3.6-31

Change-Id: I3669a6cf3dc9b6b4328cc0b6791c55803cb3ecb6

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index c6ae63b..21ee86d 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -32,7 +32,7 @@ Globals
 CREATE_MSP_INSTALLSET 1
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 30
+WINDOWSPATCHLEVEL 31
 OOOVENDOR The Document Foundation
 OOODOWNLOADNAME 1
 BUILDIDCWS {buildidcws}
@@ -57,7 +57,7 @@ LibreOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-530
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-531
 BASEPRODUCTVERSION 3.6
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -110,7 +110,7 @@ LibreOffice_Dev
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-530
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-531
 BASEPRODUCTVERSION 3.6
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -380,7 +380,7 @@ OxygenOffice
 BRANDPACKAGEVERSION 3.6
 USERDIRPRODUCTVERSION 3
 ABOUTBOXPRODUCTVERSION 3.6
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-530
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-531
 BASEPRODUCTVERSION 3.6
 PCPFILENAME openoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index c8e847d..59249f5 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=360
-RSCREVISION=360m1(Build:530)
-BUILD=530
+RSCREVISION=360m1(Build:531)
+BUILD=531
 LAST_MINOR=m1
 SOURCEVERSION=OOO360
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/table-style' - 3 commits - sw/inc sw/source

[Alex Ivan]

 sw/inc/swtblfmt.hxx |   26 ++-
 sw/inc/tblafmt.hxx  |  134 --
 sw/source/core/bastyp/init.cxx  |3 
 sw/source/core/doc/swtblfmt.cxx |  115 +++
 sw/source/core/doc/tblafmt.cxx  |  293 
 sw/source/ui/table/tautofmt.cxx |   11 -
 6 files changed, 177 insertions(+), 405 deletions(-)

New commits:
commit 6668e83e1341112872c8e7f376534c6c76aac514
Author: Alex Ivan 
Date:   Thu Jul 4 14:01:17 2013 +0300

Remove SwAutoBoxFmt class from implementation

SwAutoBoxFmt class has been completely removed from the
current implementation. All the functionality has been moved
to SwTableBoxFmt.

Change-Id: I4d4486a7819c125cf5ef6785eb4af39fff3cf145

diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index 98f2132..a1e59b3 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -63,124 +63,6 @@ struct SwAfVersions;
 
 class SvNumberFormatter;
 
-class SwBoxAutoFmt
-{
-// common attributes of Calc and Writer
-// --- from 641 on: CJK and CTL font settings
-SvxFontItem aFont;
-SvxFontHeightItem   aHeight;
-SvxWeightItem   aWeight;
-SvxPostureItem  aPosture;
-
-SvxFontItem aCJKFont;
-SvxFontHeightItem   aCJKHeight;
-SvxWeightItem   aCJKWeight;
-SvxPostureItem  aCJKPosture;
-
-SvxFontItem aCTLFont;
-SvxFontHeightItem   aCTLHeight;
-SvxWeightItem   aCTLWeight;
-SvxPostureItem  aCTLPosture;
-
-SvxUnderlineItemaUnderline;
-SvxOverlineItem aOverline;
-SvxCrossedOutItem   aCrossedOut;
-SvxContourItem  aContour;
-SvxShadowedItem aShadowed;
-SvxColorItemaColor;
-SvxBoxItem  aBox;
-SvxLineItem aTLBR;
-SvxLineItem aBLTR;
-SvxBrushItemaBackground;
-
-// Writer specific
-SvxAdjustItem   aAdjust;
-SvxFrameDirectionItem m_aTextOrientation;
-SwFmtVertOrient m_aVerticalAlignment;
-
-// Calc specific
-SvxHorJustifyItem   aHorJustify;
-SvxVerJustifyItem   aVerJustify;
-SfxBoolItem aStacked;
-SvxMarginItem   aMargin;
-SfxBoolItem aLinebreak;
-SfxInt32ItemaRotateAngle;
-SvxRotateModeItem   aRotateMode;
-
-// number format
-String  sNumFmtString;
-LanguageTypeeSysLanguage, eNumFmtLanguage;
-
-public:
-SwBoxAutoFmt();
-SwBoxAutoFmt( const SwBoxAutoFmt& rNew );
-~SwBoxAutoFmt();
-
-int operator==( const SwBoxAutoFmt& rCmp ) const;
-SwBoxAutoFmt& operator=( const SwBoxAutoFmt& rNew );
-
-// The get-methods.
-const SvxFontItem   &GetFont() const{ return aFont; }
-const SvxFontHeightItem &GetHeight() const  { return aHeight; }
-const SvxWeightItem &GetWeight() const  { return aWeight; }
-const SvxPostureItem&GetPosture() const { return aPosture; }
-const SvxFontItem   &GetCJKFont() const { return aCJKFont; }
-const SvxFontHeightItem &GetCJKHeight() const   { return aCJKHeight; }
-const SvxWeightItem &GetCJKWeight() const   { return aCJKWeight; }
-const SvxPostureItem&GetCJKPosture() const  { return aCJKPosture; }
-const SvxFontItem   &GetCTLFont() const { return aCTLFont; }
-const SvxFontHeightItem &GetCTLHeight() const   { return aCTLHeight; }
-const SvxWeightItem &GetCTLWeight() const   { return aCTLWeight; }
-const SvxPostureItem&GetCTLPosture() const  { return aCTLPosture; }
-const SvxUnderlineItem  &GetUnderline() const   { return aUnderline; }
-const SvxOverlineItem   &GetOverline() const{ return aOverline; }
-const SvxCrossedOutItem &GetCrossedOut() const  { return aCrossedOut; }
-const SvxContourItem&GetContour() const { return aContour; }
-const SvxShadowedItem   &GetShadowed() const{ return aShadowed; }
-const SvxColorItem  &GetColor() const   { return aColor; }
-const SvxAdjustItem &GetAdjust() const  { return aAdjust; }
-const SvxFrameDirectionItem& GetTextOrientation() const { return 
m_aTextOrientation; }
-const SwFmtVertOrient& GetVerticalAlignment() const { return 
m_aVerticalAlignment; }
-const SvxBoxItem&GetBox() const { return aBox; }
-const SvxLineItem   &GetTLBR() const{ return aTLBR; }
-const SvxLineItem   &GetBLTR() const{ return aBLTR; }
-const SvxBrushItem  &GetBackground() const  { return aBackground; }
-void GetValueFormat( String& rFmt, LanguageType& rLng, LanguageType& rSys 
) const
-{ rFmt = sNumFmtString; rLng = eNumFmtLanguage; rSys = eSysLanguage; }
-
-// The set-methods.
-void SetFont( const SvxFontItem& rNew ) { aFont = rNew; }
-void SetHeight( const SvxFontHeightItem& rNew ) { aHeight = rNew; }
-void SetWeight( const SvxWeightItem& rNew ) { aWeight = rNew; }
-void SetPostur

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - instsetoo_native/inc_openoffice instsetoo_native/inc_sdkoo setup_native/source

[Jürgen Schmidt]

 instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp |binary
 instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp  |binary
 setup_native/source/win32/nsis/ooobitmap.bmp   |binary
 setup_native/source/win32/nsis/ooosdkbitmap.bmp|binary
 4 files changed

New commits:
commit c65c2b343700eb7c080af8fba1ed9005b700f287
Author: Jürgen Schmidt 
Date:   Thu Jul 4 11:14:01 2013 +

#122620# update setup images, left side

diff --git 
a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp
index 97097ec..b4a9ba7 100755
Binary files 
a/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp and 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Binary/Image.bmp differ
diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp
old mode 100644
new mode 100755
index 86a48d5..b2b462b
Binary files 
a/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp and 
b/instsetoo_native/inc_sdkoo/windows/msi_templates/Binary/Image.bmp differ
commit dad1a8edb23cc4de8c96520c0838732d56a8d05a
Author: Jürgen Schmidt 
Date:   Thu Jul 4 10:20:18 2013 +

#122620# update setup images, left side

diff --git a/setup_native/source/win32/nsis/ooobitmap.bmp 
b/setup_native/source/win32/nsis/ooobitmap.bmp
index 6d142dc..b4a9ba7 100755
Binary files a/setup_native/source/win32/nsis/ooobitmap.bmp and 
b/setup_native/source/win32/nsis/ooobitmap.bmp differ
diff --git a/setup_native/source/win32/nsis/ooosdkbitmap.bmp 
b/setup_native/source/win32/nsis/ooosdkbitmap.bmp
old mode 100644
new mode 100755
index 86a48d5..b2b462b
Binary files a/setup_native/source/win32/nsis/ooosdkbitmap.bmp and 
b/setup_native/source/win32/nsis/ooosdkbitmap.bmp differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svgio/source

[Chr . Rossmanith]

 svgio/source/svgreader/svgsvgnode.cxx |  207 --
 1 file changed, 102 insertions(+), 105 deletions(-)

New commits:
commit 2ea69ec976fa7bb681746c6580753ce1b8ea
Author: Chr. Rossmanith 
Date:   Wed Jun 19 20:36:36 2013 +0200

Fix fdo#64125 - Use default for preserveAspectRatio scaling

Align code with
 - http://www.w3.org/TR/SVG/coords.html#ViewBoxAttribute
 - http://www.w3.org/TR/SVG/coords.html#PreserveAspectRatioAttribute

Use bounding box if no ViewBox is given

Change-Id: I0f1704a7c8f3140dc8c49277b88ae77d58af1407

diff --git a/svgio/source/svgreader/svgsvgnode.cxx 
b/svgio/source/svgreader/svgsvgnode.cxx
index 0eb04dd..a8daee6 100644
--- a/svgio/source/svgreader/svgsvgnode.cxx
+++ b/svgio/source/svgreader/svgsvgnode.cxx
@@ -39,7 +39,7 @@ namespace svgio
 :   SvgNode(SVGTokenSvg, rDocument, pParent),
 maSvgStyleAttributes(*this),
 mpViewBox(0),
-maSvgAspectRatio(),
+maSvgAspectRatio(SvgAspectRatio(Align_xMidYMid, false, true)),
 maX(),
 maY(),
 maWidth(),
@@ -329,127 +329,124 @@ namespace svgio
 else
 {
 // Outermost SVG element; create target range homing width 
and height as given.
-// SVG defines that x,y has no meanig for the outermost 
SVG element. Use a fallback
-// width and height of din A 4 (21 x 29,7 cm)
-double fW(getWidth().isSet() ? getWidth().solve(*this, 
xcoordinate) : (210.0 * 3.543307));
-double fH(getHeight().isSet() ? getHeight().solve(*this, 
ycoordinate) : (297.0 * 3.543307));
+// SVG defines that x,y has no meaning for the outermost 
SVG element. Use a fallback
+// width and height of DIN A 4 (21 x 29,7 cm)
+double fViewPortW(getWidth().isSet() ? 
getWidth().solve(*this, xcoordinate) : (210.0 * 3.543307));
+double fViewPortH(getHeight().isSet() ? 
getHeight().solve(*this, ycoordinate) : (297.0 * 3.543307));
+basegfx::B2DRange aSvgCanvasRange(0.0, 0.0, 0.0, 0.0);
 
 // Svg defines that a negative value is an error and that 
0.0 disables rendering
-if(basegfx::fTools::more(fW, 0.0) && 
basegfx::fTools::more(fH, 0.0))
+if(basegfx::fTools::more(fViewPortW, 0.0) && 
basegfx::fTools::more(fViewPortH, 0.0))
 {
-const basegfx::B2DRange aSvgCanvasRange(0.0, 0.0, fW, 
fH);
-
+basegfx::B2DRange aContentRange; // ViewBox or 
bounding box
 if(getViewBox())
 {
-
if(!basegfx::fTools::equalZero(getViewBox()->getWidth()) && 
!basegfx::fTools::equalZero(getViewBox()->getHeight()))
-{
-// create mapping
-const SvgAspectRatio& rRatio = 
getSvgAspectRatio();
-basegfx::B2DHomMatrix aViewBoxMapping;
-
-if(rRatio.isSet())
-{
-// let mapping be created from 
SvgAspectRatio
-aViewBoxMapping = 
rRatio.createMapping(aSvgCanvasRange, *getViewBox());
-
-// no need to check ratio here for slice, 
the outermost Svg will
-// be clipped anyways (see below)
-}
-else
-{
-// choose default mapping
-aViewBoxMapping = 
rRatio.createLinearMapping(aSvgCanvasRange, *getViewBox());
-}
-
-// scale content to viewBox definitions
-const 
drawinglayer::primitive2d::Primitive2DReference xTransform(
-new 
drawinglayer::primitive2d::TransformPrimitive2D(
-aViewBoxMapping,
-aSequence));
-
-aSequence = 
drawinglayer::primitive2d::Primitive2DSequence(&xTransform, 1);
-}
+aContentRange = *getViewBox();
 }
-
-// to be completely correct in Svg sense it is 
necessary to clip
-// the whole content to the given canvas. I choose 
here to do this
-// initially despite I found various examples of Svg 
files out there
-// which have no correct values for this clipping. 
It's correct
-// due to the Svg spec.
-   

Re: [GSOC]Use Widget Layout for the Start Center Weekly Update 02

[Caolán McNamara]

On Thu, 2013-07-04 at 12:44 +0200, Krisztian Pinter wrote:

> 
> And here are some patches where I maimed the code:
> https://gerrit.libreoffice.org/#/c/4502/
> https://gerrit.libreoffice.org/#/c/4605/

With those two applied locally, this additional attached patch will make
it work. Hope that helps.

C.

>From c50eb6800e90009e8268703353ee2ad5e5edb000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= 
Date: Thu, 4 Jul 2013 13:19:09 +0100
Subject: [PATCH] make ui-enabled backing window set layout allocation

Change-Id: I909d034ef23730f6a888b02ed1ec0c132cb105fb
---
 framework/source/services/backingwindow.cxx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx
index a5144d4..6e6d2c9 100644
--- a/framework/source/services/backingwindow.cxx
+++ b/framework/source/services/backingwindow.cxx
@@ -613,6 +613,8 @@ void BackingWindow::setOwningFrame( const com::sun::star::uno::Reference< com::s
 
 void BackingWindow::Resize()
 {
+if (isLayoutEnabled(this))
+VclContainer::setLayoutAllocation(*GetWindow(WINDOW_FIRSTCHILD), Point(0, 0), GetOutputSizePixel());
 //maToolbox.calcMinSize();
 /*
 Size aTBSize( maToolbox.getMinSize() );
-- 
1.8.3.1

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - oox/source sw/qa writerfilter/source

[Miklos Vajna]

 oox/source/vml/vmlshape.cxx   |   14 ++
 sw/qa/extras/ooxmlimport/data/n820504.docx|binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |8 +++-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
 4 files changed, 10 insertions(+), 14 deletions(-)

New commits:
commit ce5d99b706ee4d34a710041ef0acbc2319e02561
Author: Miklos Vajna 
Date:   Thu Jul 4 10:55:50 2013 +0200

bnc#820504 VML import: don't anchor shapes TO_PAGE

In theory, this is a problem because Word formats only support AT_CHAR
and AS_CHAR, so importing something as AT_PAGE is buggy.

In practice, this also leads to unvisible shapes, since
f0d001a378c64ea457e722266e60c96522c72e9b.

Change-Id: Ie730d67a789ef12734cede1f9b6c27764a66f237
(cherry picked from commit f5b7acac624f07fa95835b6054b8d295901bb1dd)
Reviewed-on: https://gerrit.libreoffice.org/4716
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 872ccac..9a5278b 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -441,18 +441,8 @@ void lcl_SetAnchorType(PropertySet& rPropSet, const 
ShapeTypeModel& rTypeModel)
 
 if ( rTypeModel.maPosition == "absolute" )
 {
-if (rTypeModel.moWrapAnchorX.get() == "page" && 
rTypeModel.moWrapAnchorY.get() == "page")
-{
-// I'm not sure if AT_PAGE is always correct here (not sure what 
the parent that
-// the spec talks about can be), but with Writer SwXDrawPage::add()
-// always in practice uses this because of 
pDoc->GetCurrentLayout() being NULL at this point.
-rPropSet.setProperty(PROP_AnchorType, 
text::TextContentAnchorType_AT_PAGE);
-}
-else
-{
-// Map to as-character by default, that fixes vertical position of 
some textframes.
-rPropSet.setProperty(PROP_AnchorType, 
text::TextContentAnchorType_AT_CHARACTER);
-}
+// Word supports as-character (inline) and at-character only, absolute 
can't be inline.
+rPropSet.setProperty(PROP_AnchorType, 
text::TextContentAnchorType_AT_CHARACTER);
 
 if ( rTypeModel.maPositionVerticalRelative == "page" )
 {
diff --git a/sw/qa/extras/ooxmlimport/data/n820504.docx 
b/sw/qa/extras/ooxmlimport/data/n820504.docx
index 36279a9..3cc2bfa 100644
Binary files a/sw/qa/extras/ooxmlimport/data/n820504.docx and 
b/sw/qa/extras/ooxmlimport/data/n820504.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 6ff2400..26ecdf3 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -532,7 +532,7 @@ void Test::testN764005()
 CPPUNIT_ASSERT(eValue != text::TextContentAnchorType_AS_CHARACTER);
 sal_Bool bValue = sal_True;
 xPropertySet->getPropertyValue("Opaque") >>= bValue;
-CPPUNIT_ASSERT_EQUAL(sal_False, bValue);
+CPPUNIT_ASSERT_EQUAL(false, bool(bValue));
 }
 
 void Test::testSmartart()
@@ -1473,6 +1473,12 @@ void Test::testN820504()
 uno::Reference 
xStyle(xStylesAccess->getByName("Default Style"), uno::UNO_QUERY);
 // The problem was that the CharColor was set to AUTO (-1) even if we have 
some default char color set
 CPPUNIT_ASSERT_EQUAL(sal_Int32(4040635), getProperty(xStyle, 
"CharColor"));
+
+// Also, the groupshape was anchored at-page instead of at-character
+// (that's incorrect as Word only supports at-character and as-character).
+uno::Reference xDrawPageSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(text::TextContentAnchorType_AT_CHARACTER, 
getProperty(xDraws->getByIndex(0), "AnchorType"));
 }
 
 void Test::testFdo43641()
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index fbc633d..1d96899 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -1716,7 +1716,7 @@ void DomainMapper_Impl::PushShapeContext( const 
uno::Reference< drawing::XShape
 if (nAnchorType == text::TextContentAnchorType_AT_PAGE)
 bIsGraphic = false;
 
-if (nAnchorType != text::TextContentAnchorType_AT_PAGE)
+if (!m_bInHeaderFooterImport)
 xProps->setPropertyValue(
 rPropNameSupplier.GetName( PROP_OPAQUE ),
 uno::makeAny( true ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/inc

[Alaa . Bukhari]

 sc/inc/dbdata.hxx|   18 +-
 sc/inc/detfunc.hxx   |   24 
 sc/inc/dpdimsave.hxx |   26 ++
 sc/inc/subtotalparam.hxx |   26 +-
 sc/inc/tabprotection.hxx |   24 
 5 files changed, 60 insertions(+), 58 deletions(-)

New commits:
commit 3aea5e4c50d0b84e4e410856696eb0bf9101fbba
Author: Alaa.Bukhari 
Date:   Thu Jul 4 14:06:25 2013 +0300

Modifying comments to meet Doxygen standards

Change-Id: I98ee2cc34bae677e18f7a70a212677704c9c57c5
Reviewed-on: https://gerrit.libreoffice.org/4717
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index fcd5d49..c9ecdfb 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -43,7 +43,7 @@ private:
 boost::scoped_ptr mpSubTotal;
 boost::scoped_ptr mpImportParam;
 
-// DBParam
+/// DBParam
 const OUString aName;
 OUString aUpper;
 SCTAB   nTable;
@@ -57,15 +57,15 @@ private:
 boolbKeepFmt;
 boolbStripData;
 
-// QueryParam
-boolbIsAdvanced;// true if created by advanced filter
-ScRange aAdvSource; // source range
+/// QueryParam
+boolbIsAdvanced;///< true if created by advanced filter
+ScRange aAdvSource; ///< source range
 
-boolbDBSelection;   // not in Param: if selection, block 
update
+boolbDBSelection;   ///< not in Param: if selection, block 
update
 
-sal_uInt16  nIndex; // unique index formulas
-boolbAutoFilter;// AutoFilter? (not saved)
-boolbModified;  // is set/cleared for/by(?) 
UpdateReference
+sal_uInt16  nIndex; ///< unique index formulas
+boolbAutoFilter;///< AutoFilter? (not saved)
+boolbModified;  ///< is set/cleared for/by(?) 
UpdateReference
 
 using ScRefreshTimer::operator==;
 
@@ -211,7 +211,7 @@ public:
 private:
 LinkaRefreshHandler;
 ScDocument* pDoc;
-sal_uInt16 nEntryIndex; // counter for unique indices
+sal_uInt16 nEntryIndex; ///< counter for unique indices
 NamedDBs maNamedDBs;
 AnonDBs maAnonDBs;
 
diff --git a/sc/inc/detfunc.hxx b/sc/inc/detfunc.hxx
index 0a63da3..7b6f75c 100644
--- a/sc/inc/detfunc.hxx
+++ b/sc/inc/detfunc.hxx
@@ -60,20 +60,20 @@ class SC_DLLPUBLIC ScDetectiveFunc
 
 enum DrawPosMode
 {
-DRAWPOS_TOPLEFT,/// Top-left edge of the cell.
-DRAWPOS_BOTTOMRIGHT,/// Bottom-right edge of the cell.
-DRAWPOS_DETARROW,   /// Position inside cell for detective arrows.
-DRAWPOS_CAPTIONLEFT,/// Top-left edge of the cell for captions.
-DRAWPOS_CAPTIONRIGHT/// Top-right edge of the cell for captions 
(incl. merged cells).
+DRAWPOS_TOPLEFT,///< Top-left edge of the cell.
+DRAWPOS_BOTTOMRIGHT,///< Bottom-right edge of the cell.
+DRAWPOS_DETARROW,   ///< Position inside cell for detective arrows.
+DRAWPOS_CAPTIONLEFT,///< Top-left edge of the cell for captions.
+DRAWPOS_CAPTIONRIGHT///< Top-right edge of the cell for captions 
(incl. merged cells).
 };
 
-/** Returns a drawing layer position for the passed cell address. */
+/** @return a drawing layer position for the passed cell address. */
 Point   GetDrawPos( SCCOL nCol, SCROW nRow, DrawPosMode eMode ) const;
 
-/** Returns the drawing layer rectangle for the passed cell range. */
+/** @return the drawing layer rectangle for the passed cell range. */
 Rectangle   GetDrawRect( SCCOL nCol1, SCROW nRow1, SCCOL nCol2, SCROW 
nRow2 ) const;
 
-/** Returns the drawing layer rectangle for the passed cell address. */
+/** @return the drawing layer rectangle for the passed cell address. */
 Rectangle   GetDrawRect( SCCOL nCol, SCROW nRow ) const;
 
 sal_BoolHasArrow( const ScAddress& rStart,
@@ -86,7 +86,7 @@ class SC_DLLPUBLIC ScDetectiveFunc
 
 voidFillAttributes( ScDetectiveData& rData );
 
-// called from DrawEntry/DrawAlienEntry and InsertObject
+/// called from DrawEntry/DrawAlienEntry and InsertObject
 sal_BoolInsertArrow( SCCOL nCol, SCROW nRow,
 SCCOL nRefStartCol, SCROW nRefStartRow,
 SCCOL nRefEndCol, SCROW nRefEndRow,
@@ -96,7 +96,7 @@ class SC_DLLPUBLIC ScDetectiveFunc
 SCCOL nEndCol, SCROW nEndRow, sal_Bool bRed,
 ScDetectiveData& rData );
 
-// DrawEntry / DrawAlienEntry check for existing arrows and 
errors
+/// DrawEntry / DrawAlienEntry check for existing arrows and 
errors
 sal_Bool 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - vcl/source

[Caolán McNamara]

 vcl/source/window/builder.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 4a5d7af326d85d7cf24193a18c2df9575c9241b2
Author: Caolán McNamara 
Date:   Thu Jul 4 11:02:34 2013 +0100

fix %VARIABLE replacements in item lists

Change-Id: I94f129e26afdac9dc2e0d712c79d73142ced5eee
(cherry picked from commit c104e2b661ec840951d39b5889495e2c42ff3d36)
Reviewed-on: https://gerrit.libreoffice.org/4715
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 3824497..d652578 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1919,6 +1919,12 @@ std::vector 
VclBuilder::handleItems(xmlreader::XmlReader &reader, const
 if (!bTranslated)
 sValue = OString(name.begin, name.length);
 
+if (m_pStringReplace)
+{
+OUString sTmp = 
(*m_pStringReplace)(OStringToOUString(sValue, RTL_TEXTENCODING_UTF8));
+sValue = OUStringToOString(sTmp, RTL_TEXTENCODING_UTF8);
+}
+
 aItems.push_back(sValue);
 ++nItemIndex;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - wizards/com

[Lionel Elie Mamane]

 wizards/com/sun/star/wizards/db/DBMetaData.java |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 534c879c06a00b563da3bf0e1727c30e064b1d39
Author: Lionel Elie Mamane 
Date:   Wed Jul 3 18:04:28 2013 +0200

handle non-wrapped SQLException

This happens e.g. when the user types a forbidden name for the query
(e.g. containing '/'

Also uniformise Logger usage instead of exception.printStackTrace

Change-Id: I29b14b65dae487e0eb61b90ceba968142981e755
Reviewed-on: https://gerrit.libreoffice.org/4708
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/wizards/com/sun/star/wizards/db/DBMetaData.java 
b/wizards/com/sun/star/wizards/db/DBMetaData.java
index 39c4f84..a75009c 100644
--- a/wizards/com/sun/star/wizards/db/DBMetaData.java
+++ b/wizards/com/sun/star/wizards/db/DBMetaData.java
@@ -856,11 +856,12 @@ public class DBMetaData
 callSQLErrorMessageDialog(sqlError, null);
 return false;
 }
-exception.printStackTrace(System.err);
+Logger.getLogger( DBMetaData.class.getName() ).log( Level.SEVERE, 
null, exception );
 }
 catch (SQLException e)
 {
-Logger.getLogger( DBMetaData.class.getName() ).log( Level.SEVERE, 
null, e );
+callSQLErrorMessageDialog(e, null);
+return false;
 }
 catch (Exception e)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - c6/5c2b343700eb7c080af8fba1ed9005b700f287 da/d1a8edb23cc4de8c96520c0838732d56a8d05a

[Caolán McNamara]

 c6/5c2b343700eb7c080af8fba1ed9005b700f287 |1 +
 da/d1a8edb23cc4de8c96520c0838732d56a8d05a |1 +
 2 files changed, 2 insertions(+)

New commits:
commit a993e8a9c2d89665717d0102d7dd1a35ded7f4d5
Author: Caolán McNamara 
Date:   Thu Jul 4 13:39:57 2013 +0100

Notes added by 'git notes add'

diff --git a/c6/5c2b343700eb7c080af8fba1ed9005b700f287 
b/c6/5c2b343700eb7c080af8fba1ed9005b700f287
new file mode 100644
index 000..00b55a3
--- /dev/null
+++ b/c6/5c2b343700eb7c080af8fba1ed9005b700f287
@@ -0,0 +1 @@
+ignore: branding
commit 8c6e1f49d7839ba1026b507c2577d2f6e2075c70
Author: Caolán McNamara 
Date:   Thu Jul 4 13:39:47 2013 +0100

Notes added by 'git notes add'

diff --git a/da/d1a8edb23cc4de8c96520c0838732d56a8d05a 
b/da/d1a8edb23cc4de8c96520c0838732d56a8d05a
new file mode 100644
index 000..00b55a3
--- /dev/null
+++ b/da/d1a8edb23cc4de8c96520c0838732d56a8d05a
@@ -0,0 +1 @@
+ignore: branding
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - dbaccess/source

[Lionel Elie Mamane]

 dbaccess/source/sdbtools/connection/objectnames.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit e8a1cd6600486d379d045bae450961a83371a052
Author: Lionel Elie Mamane 
Date:   Wed Jul 3 18:10:38 2013 +0200

database suggestname: no '/' for queries

In particular, this keeps the new query wizard
from silently failing by default
when the underlying table name has a slash: it would
generate a name proposal based on the table name,
and then use suggestName to get a similar,
yet guaranteed allowed name.

In this case, the "guaranteed allowed" part was failing,
since suggestName failed to strip slashes, which are
forbidden in query names.

Change-Id: I53d3976979ee45f5659765ed5dd3371b78837b5b
Reviewed-on: https://gerrit.libreoffice.org/4709
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx 
b/dbaccess/source/sdbtools/connection/objectnames.cxx
index 9e1d0dd..add3509 100644
--- a/dbaccess/source/sdbtools/connection/objectnames.cxx
+++ b/dbaccess/source/sdbtools/connection/objectnames.cxx
@@ -419,6 +419,10 @@ namespace sdbtools
 else
 sBaseName = OUString( SdbtRes( STR_BASENAME_QUERY ) );
 }
+else if( _CommandType == CommandType::QUERY )
+{
+sBaseName=sBaseName.replace('/', '_');
+}
 
 OUString sName( sBaseName );
 sal_Int32 i = 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 0e/0c8e770a166ad51ca13ae422fdb3c89ccc98fe 43/1e6e6a434a9c28bdef47bede3b139ea461c456

[Caolán McNamara]

 0e/0c8e770a166ad51ca13ae422fdb3c89ccc98fe |1 +
 43/1e6e6a434a9c28bdef47bede3b139ea461c456 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 83dc0da34c574cbabc03fea8d784de55f41c07f3
Author: Caolán McNamara 
Date:   Thu Jul 4 13:39:32 2013 +0100

Notes added by 'git notes add'

diff --git a/0e/0c8e770a166ad51ca13ae422fdb3c89ccc98fe 
b/0e/0c8e770a166ad51ca13ae422fdb3c89ccc98fe
new file mode 100644
index 000..00b55a3
--- /dev/null
+++ b/0e/0c8e770a166ad51ca13ae422fdb3c89ccc98fe
@@ -0,0 +1 @@
+ignore: branding
commit e93ef31fef36873784f3408a6dd5997f0a446a7e
Author: Caolán McNamara 
Date:   Thu Jul 4 13:39:21 2013 +0100

Notes added by 'git notes add'

diff --git a/43/1e6e6a434a9c28bdef47bede3b139ea461c456 
b/43/1e6e6a434a9c28bdef47bede3b139ea461c456
new file mode 100644
index 000..00b55a3
--- /dev/null
+++ b/43/1e6e6a434a9c28bdef47bede3b139ea461c456
@@ -0,0 +1 @@
+ignore: branding
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 7 commits - sc/source

[Tor Lillqvist]

 sc/source/core/opencl/openclwrapper.cxx |   30 ++
 sc/source/core/opencl/openclwrapper.hxx |5 -
 2 files changed, 14 insertions(+), 21 deletions(-)

New commits:
commit 743b111cf62ef42ead3d8dd6a4aefbb884ce8ee4
Author: Tor Lillqvist 
Date:   Thu Jul 4 15:30:16 2013 +0300

Opaque binary data is opaque binary data

No need to append a newline surely. At least in Apple's OpenCL doing
that seems to invalidate a binary OpenCL blob.

Change-Id: I68bb12d5071f6452afe5a47ddf510f7e8e60cf3e

diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index 9b9feaa..aa3ce69 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -441,16 +441,13 @@ int OpenclDevice::CompileKernelFile(GPUEnv *gpuInfo, 
const char *buildOption) {
 return 0;
 }
 
-binary = (char*) malloc(length + 2);
+binary = (char*) malloc(length);
 if (!binary) {
 return 0;
 }
 
-memset(binary, 0, length + 2);
+memset(binary, 0, length);
 b_error |= fread(binary, 1, length, fd) != length;
-if (binary[length - 1] != '\n') {
-binary[length++] = '\n';
-}
 
 fclose(fd);
 fd = NULL;
commit 7e00a3690edbf71d6c3e6c0670875485f65c567d
Author: Tor Lillqvist 
Date:   Thu Jul 4 15:13:03 2013 +0300

Use correct type for number of devices

The number returned by clGetProgramInfo(..., CL_PROGRAM_NUM_DEVICES,
...) and clGetContextInfo(..., CL_CONTEXT_NUM_DEVICES, ...) is of type
cl_uint, not size_t. That makes a difference for 64-bit code.

Change-Id: I1b494bf604dd87930484faed64042ed211b3d705

diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index f85f172..9b9feaa 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -220,7 +220,8 @@ int OpenclDevice::GeneratBinFromKernelSource(cl_program 
program,
 const char * clFileName) {
  unsigned int i = 0;
 cl_int status;
-size_t *binarySizes, numDevices;
+size_t *binarySizes;
+cl_uint numDevices;
 cl_device_id *devices;
 char **binaries, *str = NULL;
 
@@ -403,7 +404,7 @@ int OpenclDevice::CompileKernelFile(GPUEnv *gpuInfo, const 
char *buildOption) {
 const char *source;
 size_t source_size[1];
 int b_error, binary_status, binaryExisted, idx;
-size_t numDevices;
+cl_uint numDevices;
 cl_device_id *devices;
 FILE *fd, *fd1;
 const char* filename = "kernel.cl";
commit 5dff961ba5fab6d451d9d993e076d190a93be495
Author: Tor Lillqvist 
Date:   Thu Jul 4 14:59:35 2013 +0300

Don't look for just GPUs

Change-Id: Ie7dbeac17b6dc56616ae5fa16f71d568a7771d5b

diff --git a/sc/source/core/opencl/openclwrapper.cxx 
b/sc/source/core/opencl/openclwrapper.cxx
index fcb6c02..f85f172 100644
--- a/sc/source/core/opencl/openclwrapper.cxx
+++ b/sc/source/core/opencl/openclwrapper.cxx
@@ -175,7 +175,7 @@ int OpenclDevice::BinaryGenerated(const char * clFileName, 
FILE ** fhandle) {
FILE *fd = NULL;
cl_uint numDevices=0;
status = clGetDeviceIDs(gpuEnv.platform, // platform
-   CL_DEVICE_TYPE_GPU, // 
device_type
+CL_DEVICE_TYPE_ALL, // device_type
0, // num_entries
NULL, // devices
&numDevices);
@@ -651,7 +651,7 @@ int OpenclDevice::InitOpenclRunEnv(GPUEnv *gpuInfo)
 gpuInfo->platform = platforms[i];
 
 status = clGetDeviceIDs(gpuInfo->platform, // platform
-   
CL_DEVICE_TYPE_GPU, // device_type
+CL_DEVICE_TYPE_ALL, // 
device_type

0, // num_entries

NULL, // devices

&numDevices);
@@ -681,12 +681,15 @@ int OpenclDevice::InitOpenclRunEnv(GPUEnv *gpuInfo)
 gpuInfo->context = clCreateContextFromType(cps, gpuInfo->dType, NULL,
 NULL, &status);
 
+// If no GPU, check for CPU.
 if ((gpuInfo->context == (cl_context) NULL)
 || (status != CL_SUCCESS)) {
 gpuInfo->dType = CL_DEVICE_TYPE_CPU;
 gpuInfo->context = clCreateContextFromType(cps, gpuInfo->dType,
 NULL, NULL, &status);
 }
+
+// If no GPU or CPU, check for a "default" type.
 if ((gpuInf

Whats te alternative for com.sun.star.awt.DisplayAccess ?

[Fernand Vanrie]

sinds 4.1
com.sun.star.awt.DisplayAccess

is no longer working
oDisplayAccess = createUnoService("com.sun.star.awt.DisplayAccess")
oDisplayAccess is empty 
oDisplayInfo = oDisplayAccess.getByIndex(0)
aScreenArea = oDisplayInfo.ScreenArea
iScreenW =aScreenArea.Width
iScreenH =aScreenArea.Height

This was always "undocumented" i hope there is a documented alternative ?

Greetz

Fernand
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - 2 commits - writerfilter/source

[Cédric Bosdonnat]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   36 +++---
 writerfilter/source/dmapper/PropertyIds.cxx   |1 
 writerfilter/source/dmapper/PropertyIds.hxx   |1 
 3 files changed, 34 insertions(+), 4 deletions(-)

New commits:
commit 22a22a0983ec9c95e5b471395fc1c5bb813bd0d2
Author: Cédric Bosdonnat 
Date:   Thu Jul 4 15:45:01 2013 +0200

n#825976: Fixed the import of Table of Figures

Support the TOC \c switch and fixed the SetExpression current
presentation property to have updated fields and TOC.

Change-Id: I6fbd7cc38cf8ea7f08a0d15d1f39ffe4805dd62b

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index d0dc497..cb15550 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2528,6 +2528,8 @@ void DomainMapper_Impl::handleToc
 sal_Int16 nMaxLevel = 10;
 OUString sTemplate;
 OUString sChapterNoSeparator;
+OUString sFigureSequence;
+
 //  \a Builds a table of figures but does not include the 
captions's label and number
 if( lcl_FindInCommand( pContext->GetCommand(), 'a', sValue ))
 { //make it a table of figures
@@ -2542,6 +2544,8 @@ void DomainMapper_Impl::handleToc
 {
 //todo: sValue contains the label's name
 bTableOfFigures = true;
+sFigureSequence = sValue.trim();
+sFigureSequence = sFigureSequence.replaceAll("\"", 
"").replaceAll("'","");
 }
 //  \d Defines the separator between sequence and page numbers
 if( lcl_FindInCommand( pContext->GetCommand(), 'd', sValue ))
@@ -2724,6 +2728,12 @@ void DomainMapper_Impl::handleToc
 }
 }
 }
+else if (bTableOfFigures && xTOC.is())
+{
+if (!sFigureSequence.isEmpty())
+
xTOC->setPropertyValue(rPropNameSupplier.GetName(PROP_LABEL_CATEGORY),
+   uno::makeAny(sFigureSequence));
+}
 pContext->SetTOC( xTOC );
 }
 
@@ -3178,7 +3188,7 @@ void DomainMapper_Impl::CloseFieldCommand()
 // Take care of the numeric formatting definition, 
default is Arabic
 sal_Int16 nNumberingType = 
lcl_ParseNumberingType(pContext->GetCommand());
 if (nNumberingType == 
style::NumberingType::PAGE_DESCRIPTOR)
-nNumberingType == style::NumberingType::ARABIC;
+nNumberingType = style::NumberingType::ARABIC;
 xFieldProperties->setPropertyValue(
 
rPropNameSupplier.GetName(PROP_NUMBERING_TYPE),
 uno::makeAny(nNumberingType));
@@ -3327,8 +3337,13 @@ void DomainMapper_Impl::SetFieldResult( OUString& 
rResult )
 // In case of SetExpression, the field result contains 
the content of the variable.
 uno::Reference 
xServiceInfo(xTextField, uno::UNO_QUERY);
 bool bIsSetExpression = 
xServiceInfo->supportsService("com.sun.star.text.TextField.SetExpression");
+// If we already have content set, then use the 
current presentation
+rtl::OUString sValue;
+uno::Any aValue = xFieldProperties->getPropertyValue(
+rPropNameSupplier.GetName(PROP_CONTENT));
+aValue >>= sValue;
 xFieldProperties->setPropertyValue(
-rPropNameSupplier.GetName(bIsSetExpression ? 
PROP_CONTENT : PROP_CURRENT_PRESENTATION),
+rPropNameSupplier.GetName(bIsSetExpression && 
sValue.isEmpty()? PROP_CONTENT : PROP_CURRENT_PRESENTATION),
  uno::makeAny( rResult ));
 }
 }
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index 1d432fc..dda639c 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -322,6 +322,7 @@ const OUString& PropertyNameSupplier::GetName( PropertyIds 
eId ) const
 case PROP_SHADOW_FORMAT: sName = "ShadowFormat"; break;
 case PROP_RELATIVE_WIDTH: sName = "RelativeWidth"; break;
 case PROP_IS_WIDTH_RELATIVE: sName = "IsWidthRelative"; break;
+case PROP_LABEL_CATEGORY: sName = "LabelCategory"; break;
 }
 ::std::pair aInsertIt =
 m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, 
sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx 
b/writerfilter/source/dmapper/PropertyIds.hxx
index c61283c..ba032a1 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -180,6 +180,7 @@ enum 

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - setup_native/source sysui/desktop

[Jürgen Schmidt]

 setup_native/source/mac/ooo3_installer.icns |binary
 sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png |binary
 2 files changed

New commits:
commit 46b54b2fbe20d4ff4575198b5ee42acb9cb4e2ea
Author: Jürgen Schmidt 
Date:   Thu Jul 4 13:48:36 2013 +

#122620# update printeradmin icon

diff --git a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png 
b/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png
index a11cbe5..b86c6b7 100755
Binary files a/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png and 
b/sysui/desktop/icons/hicolor/48x48/apps/printeradmin.png differ
commit cf32f8e97da8a16688796006ffc4767d8d6fdae4
Author: Jürgen Schmidt 
Date:   Thu Jul 4 13:35:09 2013 +

#122620# update installer icon bundle

diff --git a/setup_native/source/mac/ooo3_installer.icns 
b/setup_native/source/mac/ooo3_installer.icns
old mode 100644
new mode 100755
index bacdd17..2fb8b03
Binary files a/setup_native/source/mac/ooo3_installer.icns and 
b/setup_native/source/mac/ooo3_installer.icns differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSOC]Use Widget Layout for the Start Center Weekly Update 02

[Krisztian Pinter]

Yes, this helps a lot, thank you very much. I knew this was gonna turn out
to be a "missing a line" type of problem. :)


On 4 July 2013 14:22, Caolán McNamara  wrote:

> On Thu, 2013-07-04 at 12:44 +0200, Krisztian Pinter wrote:
>
> >
> > And here are some patches where I maimed the code:
> > https://gerrit.libreoffice.org/#/c/4502/
> > https://gerrit.libreoffice.org/#/c/4605/
>
> With those two applied locally, this additional attached patch will make
> it work. Hope that helps.
>
> C.
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2 commits - 46/b54b2fbe20d4ff4575198b5ee42acb9cb4e2ea cf/32f8e97da8a16688796006ffc4767d8d6fdae4

[Caolán McNamara]

 46/b54b2fbe20d4ff4575198b5ee42acb9cb4e2ea |1 +
 cf/32f8e97da8a16688796006ffc4767d8d6fdae4 |1 +
 2 files changed, 2 insertions(+)

New commits:
commit e3de8724c240a5836d0f2aa71cdc56039b1b4ac2
Author: Caolán McNamara 
Date:   Thu Jul 4 15:27:22 2013 +0100

Notes added by 'git notes add'

diff --git a/46/b54b2fbe20d4ff4575198b5ee42acb9cb4e2ea 
b/46/b54b2fbe20d4ff4575198b5ee42acb9cb4e2ea
new file mode 100644
index 000..00b55a3
--- /dev/null
+++ b/46/b54b2fbe20d4ff4575198b5ee42acb9cb4e2ea
@@ -0,0 +1 @@
+ignore: branding
commit cf0fbcc67eeb42a447005464b6a54831cd1183d3
Author: Caolán McNamara 
Date:   Thu Jul 4 15:27:13 2013 +0100

Notes added by 'git notes add'

diff --git a/cf/32f8e97da8a16688796006ffc4767d8d6fdae4 
b/cf/32f8e97da8a16688796006ffc4767d8d6fdae4
new file mode 100644
index 000..00b55a3
--- /dev/null
+++ b/cf/32f8e97da8a16688796006ffc4767d8d6fdae4
@@ -0,0 +1 @@
+ignore: branding
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: drawinglayer/source

[Caolán McNamara]

 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx |   20 ++
 drawinglayer/source/processor2d/vclpixelprocessor2d.cxx|   18 ++
 drawinglayer/source/processor2d/vclprocessor2d.cxx |   91 +
 drawinglayer/source/processor2d/vclprocessor2d.hxx |1 
 4 files changed, 127 insertions(+), 3 deletions(-)

New commits:
commit 71a049c97049a38f37bf9417d752ca2d8d161a81
Author: Caolán McNamara 
Date:   Thu Jul 4 15:21:34 2013 +0100

emf+ is not decomposed into primitives, so restore wind and play

regression from f69df53b316b53931e10d35402a70f533399398c

we presumably should process comments and go through their
emfplus contents too, or something of that nature

Change-Id: Ifa8c3f058f0a320057d02b53f5717eaa42e63282

diff --git a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
index 83238c0..c9f4af1 100644
--- a/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1719,6 +1720,25 @@ namespace drawinglayer
 
 break;
 }
+case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D :
+{
+static bool bUseMetaFilePrimitiveDecomposition(true);
+const primitive2d::MetafilePrimitive2D& aMetafile = 
static_cast< const primitive2d::MetafilePrimitive2D& >(rCandidate);
+
+if(bUseMetaFilePrimitiveDecomposition && 
!aMetafile.getMetaFile().GetUseCanvas())
+{
+// Use new Metafile decomposition.
+// TODO EMF+ stuffed into METACOMMENT support required
+
process(rCandidate.get2DDecomposition(getViewInformation2D()));
+}
+else
+{
+// direct draw of MetaFile, use default processing
+RenderMetafilePrimitive2D(aMetafile);
+}
+
+break;
+}
 case PRIMITIVE2D_ID_MASKPRIMITIVE2D :
 {
 // mask group. Special handling for MetaFiles.
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index a486dd8..1376a03 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -435,7 +435,7 @@ namespace drawinglayer
 }
 case PRIMITIVE2D_ID_METAFILEPRIMITIVE2D :
 {
-   // #i98289#
+// #i98289#
 const bool 
bForceLineSnap(getOptionsDrawinglayer().IsAntiAliasing() && 
getOptionsDrawinglayer().IsSnapHorVerLinesToDiscrete());
 const sal_uInt16 
nOldAntiAliase(mpOutputDevice->GetAntialiasing());
 
@@ -444,8 +444,20 @@ namespace drawinglayer
 mpOutputDevice->SetAntialiasing(nOldAntiAliase | 
ANTIALIASING_PIXELSNAPHAIRLINE);
 }
 
-// use new Metafile decomposition
-
process(rCandidate.get2DDecomposition(getViewInformation2D()));
+const primitive2d::MetafilePrimitive2D& 
rMetafilePrimitive( static_cast< const primitive2d::MetafilePrimitive2D& 
>(rCandidate) );
+
+static bool bTestMetaFilePrimitiveDecomposition( true );
+if( bTestMetaFilePrimitiveDecomposition && 
!rMetafilePrimitive.getMetaFile().GetUseCanvas() )
+{
+// use new Metafile decomposition
+// TODO EMF+ stuffed into METACOMMENT support required
+
process(rCandidate.get2DDecomposition(getViewInformation2D()));
+}
+else
+{
+// direct draw of MetaFile
+RenderMetafilePrimitive2D( rMetafilePrimitive );
+}
 
 if(bForceLineSnap)
 {
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx 
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index d1b85ff..1ec9f50 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -782,6 +782,97 @@ namespace drawinglayer
 }
 }
 
+// direct draw of MetaFile
+void VclProcessor2D::RenderMetafilePrimitive2D(const 
primitive2d::MetafilePrimitive2D& rMetaCandidate)
+{
+// decompose matrix to check for shear, rotate and mirroring
+basegfx::B2DHomMatrix aLocalTransform(maCurrentTransformation * 
rMetaCandidate.getTransform());
+basegfx::B2DVector

[Libreoffice-commits] core.git: 2 commits - writerfilter/source

[Cédric Bosdonnat]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   46 --
 writerfilter/source/dmapper/PropertyIds.cxx   |1 
 writerfilter/source/dmapper/PropertyIds.hxx   |1 
 3 files changed, 44 insertions(+), 4 deletions(-)

New commits:
commit c7e4264bed4e77daccf2f72063e5e00f1008c3cf
Author: Cédric Bosdonnat 
Date:   Thu Jul 4 15:45:01 2013 +0200

n#825976: Fixed the import of Table of Figures

Support the TOC \c switch and fixed the SetExpression current
presentation property to have updated fields and TOC.

(cherry picked from commit 22a22a0983ec9c95e5b471395fc1c5bb813bd0d2)

Conflicts:
writerfilter/source/dmapper/DomainMapper_Impl.cxx
writerfilter/source/dmapper/PropertyIds.cxx

Conflicts:
writerfilter/source/dmapper/PropertyIds.cxx

Change-Id: I6fbd7cc38cf8ea7f08a0d15d1f39ffe4805dd62b

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 44c0a7a..871b0cf 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2576,6 +2576,8 @@ void DomainMapper_Impl::handleToc
 sal_Int16 nMaxLevel = 10;
 OUString sTemplate;
 OUString sChapterNoSeparator;
+OUString sFigureSequence;
+
 //  \a Builds a table of figures but does not include the 
captions's label and number
 if( lcl_FindInCommand( pContext->GetCommand(), 'a', sValue ))
 { //make it a table of figures
@@ -2590,6 +2592,8 @@ void DomainMapper_Impl::handleToc
 {
 //todo: sValue contains the label's name
 bTableOfFigures = true;
+sFigureSequence = sValue.trim();
+sFigureSequence = sFigureSequence.replaceAll("\"", 
"").replaceAll("'","");
 }
 //  \d Defines the separator between sequence and page numbers
 if( lcl_FindInCommand( pContext->GetCommand(), 'd', sValue ))
@@ -2777,6 +2781,12 @@ void DomainMapper_Impl::handleToc
 }
 }
 }
+else if (bTableOfFigures && xTOC.is())
+{
+if (!sFigureSequence.isEmpty())
+
xTOC->setPropertyValue(rPropNameSupplier.GetName(PROP_LABEL_CATEGORY),
+   uno::makeAny(sFigureSequence));
+}
 pContext->SetTOC( xTOC );
 }
 
@@ -3240,7 +3250,7 @@ void DomainMapper_Impl::CloseFieldCommand()
 // Take care of the numeric formatting definition, 
default is Arabic
 sal_Int16 nNumberingType = 
lcl_ParseNumberingType(pContext->GetCommand());
 if (nNumberingType == 
style::NumberingType::PAGE_DESCRIPTOR)
-nNumberingType == style::NumberingType::ARABIC;
+nNumberingType = style::NumberingType::ARABIC;
 xFieldProperties->setPropertyValue(
 rPropNameSupplier.GetName(PROP_NUMBERING_TYPE),
 uno::makeAny(nNumberingType));
@@ -3387,8 +3397,13 @@ void DomainMapper_Impl::SetFieldResult( OUString& 
rResult )
 // In case of SetExpression, the field result contains 
the content of the variable.
 uno::Reference 
xServiceInfo(xTextField, uno::UNO_QUERY);
 bool bIsSetExpression = 
xServiceInfo->supportsService("com.sun.star.text.TextField.SetExpression");
+// If we already have content set, then use the 
current presentation
+rtl::OUString sValue;
+uno::Any aValue = xFieldProperties->getPropertyValue(
+rPropNameSupplier.GetName(PROP_CONTENT));
+aValue >>= sValue;
 xFieldProperties->setPropertyValue(
-rPropNameSupplier.GetName(bIsSetExpression ? 
PROP_CONTENT : PROP_CURRENT_PRESENTATION),
+rPropNameSupplier.GetName(bIsSetExpression && 
sValue.isEmpty()? PROP_CONTENT : PROP_CURRENT_PRESENTATION),
  uno::makeAny( rResult ));
 }
 }
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index dd57a84..5cbd552 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -326,6 +326,7 @@ const OUString& PropertyNameSupplier::GetName( PropertyIds 
eId ) const
 case PROP_GRAPHIC_URL: sName = "GraphicURL"; break;
 case PROP_GRAPHIC_BITMAP: sName = "GraphicBitmap"; break;
 case PROP_CHAR_SHADING_VALUE: sName = "CharShadingValue"; break;
+case PROP_LABEL_CATEGORY: sName = "LabelCategory"; break;
 }
 ::std::pair aInsertIt =
 m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, 
sName ));
diff --git a/w

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=60270

--- Comment #41 from Pedro  ---
I nominate Bug 66420. It causes data loss and is a very common action (adding
words to personal dictionary)

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

https://bugs.freedesktop.org/show_bug.cgi?id=60270

Pedro  changed:

   What|Removed |Added

 Depends on||66420

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: writerfilter/source

[Cédric Bosdonnat]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5795edb20e642dad04f572b4fb2c0e86a7d8b6e7
Author: Cédric Bosdonnat 
Date:   Thu Jul 4 16:54:42 2013 +0200

Fixed bad cherry-pick conflict handling in writerfilter

Change-Id: I4771e198872bbc797df6388af395d7bc14cb2d76

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 871b0cf..bd9ace1 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -3231,11 +3231,11 @@ void DomainMapper_Impl::CloseFieldCommand()
 uno::Reference< text::XDependentTextField > 
xDependentField( xFieldInterface, uno::UNO_QUERY_THROW );
 xDependentField->attachTextFieldMaster( xMaster );
 
-rtl::OUString sFormula = sIdentifier + "+1";
+rtl::OUString sFormula = sSeqName + "+1";
 rtl::OUString sValue;
 if( lcl_FindInCommand( pContext->GetCommand(), 'c', 
sValue ))
 {
-sFormula = sIdentifier;
+sFormula = sSeqName;
 }
 else if( lcl_FindInCommand( pContext->GetCommand(), 
'r', sValue ))
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: starmath/source

[Frédéric Wang]

 starmath/source/mathmlexport.cxx |9 +++--
 starmath/source/parse.cxx|2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 75032fde426c781aea0af24eb9b9f6432a6bc9bb
Author: Frédéric Wang 
Date:   Thu Jul 4 10:57:35 2013 +0200

 fdo#66575 - MathML export: fix errors with newline, binom and stack.

Change-Id: I6c66864381a6a5b7415e9fae682e50865b3f76db
Reviewed-on: https://gerrit.libreoffice.org/4712
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 12f7f5a..2c9474e 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -868,8 +868,13 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int 
nLevel)
 //no subnodes, the newline is superfulous so we just drop
 //the last node, inclusion would create a bad MathML
 //table
-if (nSize >= 1 && pNode->GetSubNode(nSize-1)->GetNumSubNodes() == 0)
---nSize;
+if (nSize >= 1)
+{
+const SmNode *pLine = pNode->GetSubNode(nSize-1);
+if (pLine->GetType() == NLINE && pLine->GetNumSubNodes() > 0 &&
+pLine->GetSubNode(0)->GetToken().eType == TEND)
+--nSize;
+}
 
 // try to avoid creating a mtable element when the formula consists only
 // of a single output line
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 5929447..e532591 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -1072,7 +1072,7 @@ void SmParser::Line()
 //this is to avoid a formula tree without any caret
 //positions, in visual formula editor.
 if(ExpressionArray.empty())
-ExpressionArray.push_back(new SmExpressionNode(SmToken()));
+ExpressionArray.push_back(new SmExpressionNode(m_aCurToken));
 
 SmStructureNode *pSNode = new SmLineNode(m_aCurToken);
 pSNode->SetSubNodes(ExpressionArray);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: helpers/help_hid.lst source/text

[Caolán McNamara]

 helpers/help_hid.lst |   17 ---
 source/text/shared/optionen/01030500.xhp |   67 ---
 2 files changed, 26 insertions(+), 58 deletions(-)

New commits:
commit c457fe96e49c1b870b10b359a1833bf27c743018
Author: Caolán McNamara 
Date:   Thu Jul 4 16:08:52 2013 +0100

update help ids for html opt page .ui conversion

Change-Id: If993538261cb04223e88ae3fcc3d61ee8969ff8d

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 74f1a52..d579442 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -7036,13 +7036,6 @@ 
svx_CheckBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_CB_REMOVE_LIST,809157756,
 svx_CheckBox_RID_OFAPAGE_AUTOCORR_QUOTE_CB_TYPO,808993803,
 svx_CheckBox_RID_OFAPAGE_CONNPOOLOPTIONS_CB_DRIVERPOOLING,809206791,
 svx_CheckBox_RID_OFAPAGE_CONNPOOLOPTIONS_CB_POOL_CONNS,809206786,
-svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_IGNORE_FONTNAMES,808846358,
-svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_LOCAL_GRF,808846373,
-svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_NUMBERS_ENGLISH_US,808846359,
-svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_PRINT_EXTENSION,808846374,
-svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_STARBASIC,808846367,
-svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_STARBASIC_WARNING,808846368,
-svx_CheckBox_RID_OFAPAGE_HTMLOPT_CB_UNKNOWN_TAGS,808846357,
 svx_CheckBox_RID_OFAPAGE_SMARTTAG_OPTIONS_CB_SMARTTAGS,809256156,
 svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_CURRENTDOCONLY,811336710,
 svx_CheckBox_RID_OFA_TP_INTERNATIONAL_CB_SHTVW_RIGHT2LEFT,811336709,
@@ -7293,8 +7286,6 @@ svx_ListBox_OFA_TP_VIEW_LB_MENU_ICONS,810520105,
 svx_ListBox_OFA_TP_VIEW_LB_MOUSEMIDDLE,810520098,
 svx_ListBox_OFA_TP_VIEW_LB_MOUSEPOS,810520095,
 svx_ListBox_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_DCB_EXPAND_KEY,809160323,
-svx_ListBox_RID_OFAPAGE_HTMLOPT_LB_CHARSET,808848937,
-svx_ListBox_RID_OFAPAGE_HTMLOPT_LB_EXPORT,808848935,
 svx_ListBox_RID_OPTPAGE_CHART_DEFCOLORS_LB_CHART_COLOR_LIST,705613314,
 svx_ListBox_RID_SFXDLG_EDITDICT_LB_ALLDICTS,1270418976,
 svx_ListBox_RID_SFXDLG_EDITDICT_LB_DICTLANG,1270418957,
@@ -7572,13 +7563,6 @@ svx_NumericField_OFA_TP_VIEW_NF_AA_POINTLIMIT,810522688,
 svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MAX_ENTRIES,809162881,
 svx_NumericField_RID_OFAPAGE_AUTOCOMPLETE_OPTIONS_NF_MIN_WORDLEN,809162880,
 svx_NumericField_RID_OFAPAGE_CONNPOOLOPTIONS_NF_TIMEOUT,809211913,
-svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE1,808851459,
-svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE2,808851461,
-svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE3,808851463,
-svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE4,808851465,
-svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE5,808851467,
-svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE6,808851469,
-svx_NumericField_RID_OFAPAGE_HTMLOPT_NF_SIZE7,808851471,
 svx_NumericField_RID_SVXDLG_LNG_ED_NUM_PREBREAK_ED_PREBREAK,1251186996,
 svx_NumericField_RID_SVXDLG_SEARCHSIMILARITY_NF_LONGER,1237964821,
 svx_NumericField_RID_SVXDLG_SEARCHSIMILARITY_NF_OTHER,1237964817,
@@ -7807,7 +7791,6 @@ 
svx_RadioButton_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_BELOW,1237598727,
 svx_RadioButton_RID_SVX_MDLG_HANGULHANJA_RB_HANJA_HANGUL_BRACKETED,1237598722,
 svx_RadioButton_RID_SVX_MDLG_HANGULHANJA_RB_SIMPLE_CONVERSION,1237598721,
 svx_TabPage_RID_OFAPAGE_CONNPOOLOPTIONS,809205760,
-svx_TabPage_RID_OFAPAGE_HTMLOPT,808845312,
 svx_TabPage_RID_OFA_TP_INTERNATIONAL,811335680,
 svx_TabPage_RID_SFXPAGE_DBREGISTER,809222144,
 svx_TabPage_RID_SVXPAGE_EVENTASSIGN,705675264,
diff --git a/source/text/shared/optionen/01030500.xhp 
b/source/text/shared/optionen/01030500.xhp
index 1833471..ba97371 100644
--- a/source/text/shared/optionen/01030500.xhp
+++ b/source/text/shared/optionen/01030500.xhp
@@ -31,69 +31,54 @@
 $[officename] Basic scripts in HTML 
documents
 HTML;compatibility settings
 
-
+
 HTML compatibility
-Defines settings for 
HTML pages.
+Defines settings for 
HTML pages.
 
 
   
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
 Font sizes
-Use 
the spin buttons Size 1 to Size 7 to define the 
respective font sizes for the HTML  to  
tags.
+Use the spin buttons 
Size 1 to Size 7 to define the respective font sizes 
for the HTML  to  
tags.
 Import
 Defines the settings for importing HTML documents.
-
+
 Use 'English (USA)' locale for numbers
 When importing numbers from an HTML page, the decimal separator and 
the thousands separator characters differ according to the locale of the HTML 
page. The clipboard however contains no information about the locale. For 
example, the characters "1.000" copied from a German Web page most possibly 
mean "one thousand" because the period is the thousands separator in a German 
locale. If copied from an English Web page, the same characters stand for the 
number 1 as in "one dot zero zero zero".
 If not checked, numbers will be interpreted according 
to the setting in Language Settings - Language of - Locale setting 
in the Options dialog box. If checked, numbers will be interpreted as 'En