date:20131219

 helpcontent2|2 -
 sc/inc/helpids.h|   10 -
 sc/inc/sc.hrc   |5 
 sc/source/ui/dbgui/tpsubt.cxx   |   11 +++---
 sc/uiconfig/scalc/ui/subtotalgrppage.ui |   34 ++--
 5 files changed, 25 insertions(+), 37 deletions(-)

New commits:
commit a87bce32e9a4f61c2fe81f0aec5b1e1dc9ca55ad
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Dec 18 20:34:42 2013 +

set mnemonic widgets and a max height

Change-Id: If52541caf94b76b38b3ec8b606db7bbc734d2591

diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 51f973b..9188d40 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -46,11 +46,7 @@
 #define HID_SC_NAVIPI_ROOT  
SC_HID_SC_NAVIPI_ROOT
 #define HID_SC_NAVIPI_SCEN  
SC_HID_SC_NAVIPI_SCEN
 #define HID_SC_NAVIPI_DROP  
SC_HID_SC_NAVIPI_DROP
-//  Teilergebnisse
-#define HID_SC_SUBT_GROUP   
SC_HID_SC_SUBT_GROUP
-#define HID_SC_SUBT_COLS
SC_HID_SC_SUBT_COLS
-#define HID_SC_SUBT_FUNC
SC_HID_SC_SUBT_FUNC
-//
+
 #define HID_SC_NAVIPI_TOOLBOX   
SC_HID_SC_NAVIPI_TOOLBOX
 //  Bereich ist voll!
 
@@ -58,10 +54,6 @@
 #define HID_SC_PIVOTFILTER  
SC_HID_SC_PIVOTFILTER
 #define HID_SC_INPORTOPT
SC_HID_SC_INPORTOPT
 #define HID_SC_PIVOTSUBT
SC_HID_SC_PIVOTSUBT
-#define HID_SCPAGE_SUBT_GROUP   
SC_HID_SCPAGE_SUBT_GROUP
-#define HID_SCPAGE_SUBT_GROUP1  
SC_HID_SCPAGE_SUBT_GROUP1
-#define HID_SCPAGE_SUBT_GROUP2  
SC_HID_SCPAGE_SUBT_GROUP2
-#define HID_SCPAGE_SUBT_GROUP3  
SC_HID_SCPAGE_SUBT_GROUP3
 
 #define HID_SC_NAVIGATOR
SC_HID_SC_NAVIGATOR
 
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 83f602c..a1de716 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1005,7 +1005,6 @@
 #define RID_SCDLG_DBNAMES   (SC_DIALOGS_START + 23)
 #define RID_SCDLG_SOLVER(SC_DIALOGS_START + 26)
 #define RID_SCDLG_SUBTOTALS (SC_DIALOGS_START + 27)
-#define RID_SUBTBASE(SC_DIALOGS_START + 28)
 #define RID_SCPAGE_SUBT_OPTIONS (SC_DIALOGS_START + 29)
 #define RID_SCPAGE_USERLISTS(SC_DIALOGS_START + 31)
 #define RID_SCDLG_PIVOTFILTER   (SC_DIALOGS_START + 33)
@@ -1058,10 +1057,6 @@
 #define RID_DROPMODE_COPY   (SC_DIALOGS_START + 95)
 #define RID_SCDLG_CONDFORMAT(SC_DIALOGS_START + 96)
 
-#define RID_SCPAGE_SUBT_GROUP1  (SC_DIALOGS_START + 97)
-#define RID_SCPAGE_SUBT_GROUP2  (SC_DIALOGS_START + 98)
-#define RID_SCPAGE_SUBT_GROUP3  (SC_DIALOGS_START + 99)
-
 // derivations from RID_SCDLG_MTRINPUT
 #define RID_SCDLG_COL_MAN   (SC_DIALOGS_START + 104)
 #define RID_SCDLG_COL_OPT   (SC_DIALOGS_START + 105)
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 94be603..28fb52a 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -50,9 +50,14 @@ ScTpSubTotalGroup::ScTpSubTotalGroup( Window* pParent,
 GetSubTotalData() ),
 nFieldCount ( 0 )
 {
-get( mpLbGroup, group_by);
-get( mpLbColumns, columns);
-get( mpLbFunctions, functions);
+get(mpLbGroup, group_by);
+get(mpLbColumns, columns);
+get(mpLbFunctions, functions);
+
+long nHeight = mpLbColumns-GetTextHeight() * 14;
+mpLbColumns-set_height_request(nHeight);
+mpLbFunctions-set_height_request(nHeight);
+
 // Font is correctly initialized by SvTreeListBox ctor
 mpLbColumns-SetSelectionMode( SINGLE_SELECTION );
 mpLbColumns-SetDragDropMode( SV_DRAGDROP_NONE );
diff --git a/sc/uiconfig/scalc/ui/subtotalgrppage.ui 
b/sc/uiconfig/scalc/ui/subtotalgrppage.ui
index b0aeaf1..57b7548 100644
--- a/sc/uiconfig/scalc/ui/subtotalgrppage.ui
+++ b/sc/uiconfig/scalc/ui/subtotalgrppage.ui
@@ -1,6 +1,7 @@
 ?xml version=1.0 encoding=UTF-8?
 interface
   !-- interface-requires gtk+ 3.0 --
+  !-- interface-requires LibreOffice 1.0 --
   object class=GtkListStore id=liststore1
 columns
   !-- column-name gchararray1 --
@@ -42,21 +43,22 @@
   object class=GtkBox id=SubTotalGrpPage
 property name=visibleTrue/property
 property name=can_focusFalse/property
-property name=orientationvertical/property
 property name=border_width6/property
+property name=orientationvertical/property
 property name=spacing12/property
 child
   object class=GtkBox id=box2
 property name=visibleTrue/property
 property name=can_focusFalse/property
-

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

 helpers/help_hid.lst  |7 ---
 source/text/scalc/01/12050100.xhp |   19 ---
 2 files changed, 8 insertions(+), 18 deletions(-)

New commits:
commit 37d4a61d6980cb62c580f94adc8595e6eb4c3fdd
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Wed Dec 18 20:38:35 2013 +

update help ids for Sub Total Group page .ui conversion

Change-Id: If6b54e33a2f1cf0ba44b9066159c27b4853c4435

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 6553a7f..b11241b 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3076,10 +3076,6 @@ HID_SCH_TITLE_Z,63364,
 HID_SCH_WIN_DOCUMENT,63289,
 HID_SCH_WIZARD_ROADMAP,63365,
 HID_SCPAGE_AREAS,58882,
-HID_SCPAGE_SUBT_GROUP,58876,
-HID_SCPAGE_SUBT_GROUP1,58885,
-HID_SCPAGE_SUBT_GROUP2,58886,
-HID_SCPAGE_SUBT_GROUP3,58887,
 HID_SCPAGE_SUBT_OPTIONS,58875,
 HID_SCRIPTORG_DIALOG,39987,
 HID_SCRIPTSBOX,40011,
@@ -3175,9 +3171,6 @@ HID_SC_SORT_ACTION,58985,
 HID_SC_SORT_AUTHOR,58986,
 HID_SC_SORT_COMMENT,58988,
 HID_SC_SORT_DATE,58987,
-HID_SC_SUBT_COLS,58865,
-HID_SC_SUBT_FUNC,58866,
-HID_SC_SUBT_GROUP,58864,
 HID_SC_TOOLBOX_DRAW,58940,
 HID_SC_TOOLBOX_DRTEXT,58941,
 HID_SC_WIN_GRIDWIN,58818,
diff --git a/source/text/scalc/01/12050100.xhp 
b/source/text/scalc/01/12050100.xhp
index 126c7d7..05104ae 100644
--- a/source/text/scalc/01/12050100.xhp
+++ b/source/text/scalc/01/12050100.xhp
@@ -32,11 +32,9 @@
 /meta
 body
 section id=gruppe
-bookmark xml-lang=en-US branch=hid/SC_HID_SCPAGE_SUBT_GROUP2 
id=bm_id3147335 localize=false/
-bookmark xml-lang=en-US branch=hid/SC_HID_SCPAGE_SUBT_GROUP3 
id=bm_id3150085 localize=false/
-bookmark xml-lang=en-US branch=hid/SC_HID_SCPAGE_SUBT_GROUP1 
id=bm_id3153252 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/subtotalgrppage/SubTotalGrpPage id=bm_id3147335 
localize=false/
 paragraph role=heading id=hd_id3149784 xml-lang=en-US level=1 
l10n=U oldref=1link href=text/scalc/01/12050100.xhp name=1st, 2nd, 3rd 
Group1st, 2nd, 3rd Group/link/paragraph
-paragraph role=paragraph id=par_id3145068 xml-lang=en-US l10n=U 
oldref=2ahelp hid=HID_SCPAGE_SUBT_GROUP1Specify the settings for up to 
three subtotal groups. Each tab has the same layout./ahelp/paragraph
+paragraph role=paragraph id=par_id3145068 xml-lang=en-US l10n=U 
oldref=2ahelp 
hid=modules/scalc/ui/subtotalgrppage/SubTotalGrpPageSpecify the settings for 
up to three subtotal groups. Each tab has the same layout./ahelp/paragraph
 /section
 section id=howtoget
   embed href=text/scalc/00/0412.xhp#dntezd/
@@ -62,15 +60,14 @@
 paragraph role=listitem id=par_id3154321 xml-lang=en-US l10n=U 
oldref=15Click emphOK/emph./paragraph
 /listitem
 /list
-bookmark xml-lang=en-US branch=hid/SC_HID_SC_SUBT_GROUP id=bm_id3163713 
localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/subtotalgrppage/group_by id=bm_id3163713 
localize=false/
 paragraph role=heading id=hd_id3156441 xml-lang=en-US level=2 
l10n=U oldref=7Group by/paragraph
-paragraph role=paragraph id=par_id3154013 xml-lang=en-US l10n=U 
oldref=8ahelp hid=HID_SC_SUBT_GROUPSelect the column that you want to 
control the subtotal calculation process. If the contents of the selected 
column change, the subtotals are automatically recalculated./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/SC_HID_SCPAGE_SUBT_GROUP 
id=bm_id3154492 localize=false/
-bookmark xml-lang=en-US branch=hid/SC_HID_SC_SUBT_COLS id=bm_id3149379 
localize=false/
+paragraph role=paragraph id=par_id3154013 xml-lang=en-US l10n=U 
oldref=8ahelp hid=modules/scalc/ui/subtotalgrppage/group_bySelect the 
column that you want to control the subtotal calculation process. If the 
contents of the selected column change, the subtotals are automatically 
recalculated./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/subtotalgrppage/columns id=bm_id3149379 
localize=false/
 paragraph role=heading id=hd_id3154943 xml-lang=en-US level=2 
l10n=U oldref=9Calculate subtotals for/paragraph
-paragraph role=paragraph id=par_id3147125 xml-lang=en-US l10n=U 
oldref=10ahelp hid=HID_SC_SUBT_COLSSelect the column(s) containing the 
values that you want to subtotal./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/SC_HID_SC_SUBT_FUNC id=bm_id3149413 
localize=false/
+paragraph role=paragraph id=par_id3147125 xml-lang=en-US l10n=U 
oldref=10ahelp hid=modules/scalc/ui/subtotalgrppage/columnsSelect the 
column(s) containing the values that you want to subtotal./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/scalc/ui/subtotalgrppage/functions id=bm_id3149413 
localize=false/
 paragraph role=heading id=hd_id3156283 xml-lang=en-US level=2 
l10n=U oldref=11Use function/paragraph
-paragraph role=paragraph id=par_id3145647 xml-lang=en-US l10n=U 
oldref=12ahelp hid=HID_SC_SUBT_FUNCSelect the mathematical function that 
you want to use to calculate the subtotals./ahelp/paragraph
+paragraph role=paragraph id=par_id3145647 xml-lang=en-US l10n=U 
oldref=12ahelp

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

 cppuhelper/source/servicemanager.cxx |   37 ++-
 1 file changed, 20 insertions(+), 17 deletions(-)

New commits:
commit 0506c3a1f04e707684834fe8fd60ab5d0a96cc0e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 19 09:55:44 2013 +0100

FactoryWrapper is a misnomer now

Change-Id: I59d77b4712e273318409a326c835861dc467596c

diff --git a/cppuhelper/source/servicemanager.cxx 
b/cppuhelper/source/servicemanager.cxx
index 9a271d2..4044c1c 100644
--- a/cppuhelper/source/servicemanager.cxx
+++ b/cppuhelper/source/servicemanager.cxx
@@ -518,14 +518,14 @@ css::beans::Property getDefaultContextProperty() {
 css::beans::PropertyAttribute::READONLY);
 }
 
-class FactoryWrapper:
+class ImplementationWrapper:
 public cppu::WeakImplHelper3
 css::lang::XSingleComponentFactory, css::lang::XSingleServiceFactory,
 css::lang::XServiceInfo ,
 private boost::noncopyable
 {
 public:
-FactoryWrapper(
+ImplementationWrapper(
 rtl::Reference cppuhelper::ServiceManager  const  manager,
 boost::shared_ptr
 cppuhelper::ServiceManager::Data::ImplementationInfo  const 
@@ -534,7 +534,7 @@ public:
 { assert(manager.is()  info.get() != 0); }
 
 private:
-virtual ~FactoryWrapper() {}
+virtual ~ImplementationWrapper() {}
 
 virtual css::uno::Reference css::uno::XInterface  SAL_CALL
 createInstanceWithContext(
@@ -579,7 +579,7 @@ private:
 };
 
 css::uno::Reference css::uno::XInterface 
-FactoryWrapper::createInstanceWithContext(
+ImplementationWrapper::createInstanceWithContext(
 css::uno::Reference css::uno::XComponentContext  const  Context)
 throw (css::uno::Exception, css::uno::RuntimeException)
 {
@@ -595,7 +595,7 @@ FactoryWrapper::createInstanceWithContext(
 }
 
 css::uno::Reference css::uno::XInterface 
-FactoryWrapper::createInstanceWithArgumentsAndContext(
+ImplementationWrapper::createInstanceWithArgumentsAndContext(
 css::uno::Sequence css::uno::Any  const  Arguments,
 css::uno::Reference css::uno::XComponentContext  const  Context)
 throw (css::uno::Exception, css::uno::RuntimeException)
@@ -609,14 +609,15 @@ FactoryWrapper::createInstanceWithArgumentsAndContext(
 : factory2_-createInstanceWithArguments(Arguments);
 }
 
-css::uno::Reference css::uno::XInterface  FactoryWrapper::createInstance()
+css::uno::Reference css::uno::XInterface 
+ImplementationWrapper::createInstance()
 throw (css::uno::Exception, css::uno::RuntimeException)
 {
 return createInstanceWithContext(manager_-getContext());
 }
 
 css::uno::Reference css::uno::XInterface 
-FactoryWrapper::createInstanceWithArguments(
+ImplementationWrapper::createInstanceWithArguments(
 css::uno::Sequence css::uno::Any  const  Arguments)
 throw (css::uno::Exception, css::uno::RuntimeException)
 {
@@ -624,19 +625,20 @@ FactoryWrapper::createInstanceWithArguments(
 Arguments, manager_-getContext());
 }
 
-rtl::OUString FactoryWrapper::getImplementationName()
+rtl::OUString ImplementationWrapper::getImplementationName()
 throw (css::uno::RuntimeException)
 {
 return info_-name;
 }
 
-sal_Bool FactoryWrapper::supportsService(rtl::OUString const  ServiceName)
+sal_Bool ImplementationWrapper::supportsService(rtl::OUString const  
ServiceName)
 throw (css::uno::RuntimeException)
 {
 return cppu::supportsService(this, ServiceName);
 }
 
-css::uno::Sequence rtl::OUString  FactoryWrapper::getSupportedServiceNames()
+css::uno::Sequence rtl::OUString 
+ImplementationWrapper::getSupportedServiceNames()
 throw (css::uno::RuntimeException)
 {
 if (info_-services.size()  static_cast sal_uInt32 (SAL_MAX_INT32)) {
@@ -656,7 +658,7 @@ css::uno::Sequence rtl::OUString  
FactoryWrapper::getSupportedServiceNames()
 return names;
 }
 
-void FactoryWrapper::loadImplementation(
+void ImplementationWrapper::loadImplementation(
 css::uno::Reference css::uno::XComponentContext  const  context)
 {
 {
@@ -1113,12 +1115,13 @@ cppuhelper::ServiceManager::createContentEnumeration(
 break;
 }
 if (!impl-loaded) {
-// Postpone actual factory instantiation as long as possible 
(so
-// that e.g. opening LO's Tools - Macros menu does not try to
-// instantiate a JVM, which can lead to a synchronous error
-// dialog when no JVM is specified, and showing the dialog 
while
-// hovering over a menu can cause trouble):
-impl-factory1 = new FactoryWrapper(this, impl-info);
+// Postpone actual implementation instantiation as long as
+// possible (so that e.g. opening LO's Tools - Macros menu
+// does not try to instantiate a JVM, which can lead to a
+// synchronous error dialog when no JVM is specified, and
+// showing the dialog while hovering over a menu can cause
+

[Libreoffice-commits] core.git: include/osl

 include/osl/detail/component-declarations.h |   24 
 1 file changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 61e02585ea3ab6794fcae28c9b96d35b3ff96257
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 19 09:58:59 2013 +0100

Fix up constructor function declarations

Change-Id: I68ec96b20da1603e5cafd31d620d8dd54306627a

diff --git a/include/osl/detail/component-declarations.h 
b/include/osl/detail/component-declarations.h
index 8bcbda3..b8fb658 100644
--- a/include/osl/detail/component-declarations.h
+++ b/include/osl/detail/component-declarations.h
@@ -97,18 +97,18 @@ void * xo_component_getFactory( const char * , void * , 
void * );
 void * xof_component_getFactory( const char * , void * , void * );
 void * xstor_component_getFactory( const char * , void * , void * );
 
-void * com_sun_star_comp_extensions_xml_sax_FastParser_component_getFactory( 
const char * , void * , void * );
-void * com_sun_star_comp_extensions_xml_sax_ParserExpat_component_getFactory( 
const char * , void * , void * );
-void * com_sun_star_comp_stoc_DLLComponentLoader_component_getFactory( const 
char * , void * , void * );
-void * com_sun_star_comp_stoc_ImplementationRegistration_component_getFactory( 
const char * , void * , void * );
-void * com_sun_star_comp_stoc_NestedRegistry_component_getFactory( const char 
* , void * , void * );
-void * com_sun_star_comp_stoc_ORegistryServiceManager_component_getFactory( 
const char * , void * , void * );
-void * com_sun_star_comp_stoc_OServiceManager_component_getFactory( const char 
* , void * , void * );
-void * com_sun_star_comp_stoc_OServiceManagerWrapper_component_getFactory( 
const char * , void * , void * );
-void * com_sun_star_comp_stoc_SimpleRegistry_component_getFactory( const char 
* , void * , void * );
-void * com_sun_star_extensions_xml_sax_Writer_component_getFactory( const char 
* , void * , void * );
-void * com_sun_star_security_comp_stoc_AccessController_component_getFactory( 
const char * , void * , void * );
-void * com_sun_star_security_comp_stoc_FilePolicy_component_getFactory( const 
char * , void * , void * );
+void * com_sun_star_comp_extensions_xml_sax_FastParser( void * , void * );
+void * com_sun_star_comp_extensions_xml_sax_ParserExpat( void * , void * );
+void * com_sun_star_comp_stoc_DLLComponentLoader( void * , void * );
+void * com_sun_star_comp_stoc_ImplementationRegistration( void * , void * );
+void * com_sun_star_comp_stoc_NestedRegistry( void * , void * );
+void * com_sun_star_comp_stoc_ORegistryServiceManager( void * , void * );
+void * com_sun_star_comp_stoc_OServiceManager( void * , void * );
+void * com_sun_star_comp_stoc_OServiceManagerWrapper( void * , void * );
+void * com_sun_star_comp_stoc_SimpleRegistry( void * , void * );
+void * com_sun_star_extensions_xml_sax_Writer( void * , void * );
+void * com_sun_star_security_comp_stoc_AccessController( void * , void * );
+void * com_sun_star_security_comp_stoc_FilePolicy( void * , void * );
 
 #ifdef __cplusplus
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Copying and pasting docx theme font attributes

Hi Jacobo,

On Wed, Dec 18, 2013 at 01:34:18PM +0100, Jacobo Aragunde Pérez 
jaragu...@igalia.com wrote:
 Copying the information in the theme and the styles files when pasting
 things is probably not a viable idea, but maybe we should transform the
 theme format into direct format when pasting the text to a new document.

Hmm, shouldn't we already convert that to direct formatting on import?
Otherwise if saving as ODT, the correct font will be lost, I assume.

We do this already for table styles (applying the style as direct
formatting during import).

 What do you think? And if you agree, where I should start reading code? ;)

Copypaste is handled by copying the selected SwPaM to a clipboard
document on Ctrl-C, and then copying from that document to the real one
on Ctrl-V. SwFEShell's Copy() and Paste() methods are probably what
you're looking for.

However, as mentioned above, I think it would be better to handle this
on import, not during editing.

Miklos


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

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

 xmloff/source/text/XMLTextHeaderFooterContext.cxx |1 
 xmloff/source/text/XMLTextMasterPageExport.cxx|   24 +++---
 2 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit 854866140bff2ae4c587c7adc9b3170f06135437
Author: Michael Stahl mst...@redhat.com
Date:   Wed Dec 18 23:34:54 2013 +0100

fdo#72850: ODF export: don't export spurious style:display=false

... on style:header-left, style:header-first, style:footer-left,
style:footer-first.

(regression from d92345561c998f7382cf9ef0fdcd29096f978435)

Change-Id: I48c51fcd2b07ae8b0e3ec2c1087a388c6900b366
(cherry picked from commit 8f73c7615ebe60ef71d6e8b49a0f19ddac6f03a0)
Reviewed-on: https://gerrit.libreoffice.org/7141
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk

diff --git a/xmloff/source/text/XMLTextHeaderFooterContext.cxx 
b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
index ba423dc..335d95b 100644
--- a/xmloff/source/text/XMLTextHeaderFooterContext.cxx
+++ b/xmloff/source/text/XMLTextHeaderFooterContext.cxx
@@ -54,6 +54,7 @@ XMLTextHeaderFooterContext::XMLTextHeaderFooterContext( 
SvXMLImport rImport, sa
 bLeft( bLft ),
 bFirst( bFrst )
 {
+// NOTE: if this ever handles XML_DISPLAY attr then beware of fdo#72850 !
 if( bLeft || bFirst )
 {
 Any aAny;
diff --git a/xmloff/source/text/XMLTextMasterPageExport.cxx 
b/xmloff/source/text/XMLTextMasterPageExport.cxx
index aafe94a..cb3b2f5 100644
--- a/xmloff/source/text/XMLTextMasterPageExport.cxx
+++ b/xmloff/source/text/XMLTextMasterPageExport.cxx
@@ -128,18 +128,18 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 sal_Bool bHeader = sal_False;
 aAny = bHeader;
 
-sal_Bool bHeaderFirst = sal_False;
+sal_Bool bHeaderFirstShared = sal_False;
 if( bHeader )
 {
 aAny = rPropSet-getPropertyValue( sFirstShareContent );
-aAny = bHeaderFirst;
+aAny = bHeaderFirstShared;
 }
 
-sal_Bool bHeaderLeft = sal_False;
+sal_Bool bHeaderLeftShared = sal_False;
 if( bHeader )
 {
 aAny = rPropSet-getPropertyValue( sHeaderShareContent );
-aAny = bHeaderLeft;
+aAny = bHeaderLeftShared;
 }
 
 if( xHeaderText.is() )
@@ -154,7 +154,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 
 if( xHeaderTextFirst.is()  xHeaderTextFirst != xHeaderText )
 {
-if( !bHeaderFirst )
+if (bHeaderFirstShared)
 GetExport().AddAttribute( XML_NAMESPACE_STYLE,
   XML_DISPLAY, XML_FALSE );
 SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
@@ -164,7 +164,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 
 if( xHeaderTextLeft.is()  xHeaderTextLeft != xHeaderText )
 {
-if( !bHeaderLeft )
+if (bHeaderLeftShared)
 GetExport().AddAttribute( XML_NAMESPACE_STYLE,
   XML_DISPLAY, XML_FALSE );
 SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
@@ -176,18 +176,18 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 sal_Bool bFooter = sal_False;
 aAny = bFooter;
 
-sal_Bool bFooterFirst = sal_False;
+sal_Bool bFooterFirstShared = sal_False;
 if( bFooter )
 {
 aAny = rPropSet-getPropertyValue( sFirstShareContent );
-aAny = bFooterFirst;
+aAny = bFooterFirstShared;
 }
 
-sal_Bool bFooterLeft = sal_False;
+sal_Bool bFooterLeftShared = sal_False;
 if( bFooter )
 {
 aAny = rPropSet-getPropertyValue( sFooterShareContent );
-aAny = bFooterLeft;
+aAny = bFooterLeftShared;
 }
 
 if( xFooterText.is() )
@@ -202,7 +202,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 
 if( xFooterTextFirst.is()  xFooterTextFirst != xFooterText )
 {
-if( !bFooterFirst )
+if (bFooterFirstShared)
 GetExport().AddAttribute( XML_NAMESPACE_STYLE,
   XML_DISPLAY, XML_FALSE );
 SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
@@ -212,7 +212,7 @@ void XMLTextMasterPageExport::exportMasterPageContent(
 
 if( xFooterTextLeft.is()  xFooterTextLeft != xFooterText )
 {
-if( !bFooterLeft )
+if (bFooterLeftShared)
 GetExport().AddAttribute( XML_NAMESPACE_STYLE,
   XML_DISPLAY, XML_FALSE );
 SvXMLElementExport aElem( GetExport(), XML_NAMESPACE_STYLE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

Re: Efficient UNO component linkage GC ...


thought-dump:

* loader != com.sun.star.loader.SharedLibrary (i.e., Java, Python, 
...) remains unchanged


* external code (extensions) remains unchanged (i.e., stuck with the 
original .component XML format for now; no prefix=..., 
extension=..., constructor=...; mandatory 
component_getImplementationEnvironment); this allows to experiment with 
the new features internally


* assume all LO-internal C++ implementations are ComponentContext-based 
(i.e., use cppu::createSingleComponentFactory or 
cppu::createOneInstanceComponentFactory rather than legacy 
ServiceManager-based cppu::createSingleFactory or 
cppu::createOneInstanceFactory); reaching this state is effectively an 
easy hack


* implementations of non-single-instance services can be rewritten using 
the new .component XML implementation constructor=... feature, cf. 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=ae3a0c8da50b36db395984637f5ad74d3b4887bc 
Add .component implementation constructor='...' feature; this is 
effectively an easy hack (note that service manager's 
createInstanceWithArguments[andContext] no longer uses the 
css.lang.XInitialization protocol on those implementations)


* for implementations of single-instance services/singletons, we can:

** either stick with the recently introduced prefix=direct feature, 
where the service manager obtains a factory for them; any instantiated 
object instances will continue to be disposed well ahead of exit via 
disposing the ComponentContext in desktop::Desktop::DeInit 
(desktop/source/app/app.cxx)


** or also use the constructor=... feature, in which case the 
individual constructor functions would need to hold a single instance, 
which could postpone that instance's destruction to atexit, with all 
dreaded consequences (an option might be to hold the single instance weakly)


** or use some implementation single-instance=true flag in .component 
XML and implement the logic of holding a single instance in the service 
manager, which would dispose them when it gets disposed well ahead of exit


* next step is to let certain occurrences of UNO service constructor 
(and singleton getter) calls in C++ code call corresponding constructor 
functions directly (instead of going via service manager's 
createInstanceWith[ArgumentsAnd]Context); conditions under which this 
simplification can be done:


** caller and implementation use the same environment (e.g., both gcc3; 
this is not the case e.g. for 
connectivity/source/drivers/jdbc/jdbc.component's 
environment=@CPPU_ENV@:affine)


** and caller knows that the constructor function is visible (i.e., the 
library/executable supplying it is loaded)


** note that there are always situations where UNO services are not 
called via constructor, though; e.g., the constructor-less 
css.uri.UriSchemeParser_* services are always created via dynamically 
computed name


* idea is to set aside for every UNO service/singleton S two macros 
LO_URE_CTOR_ENV_S' and LO_URE_CTOR_FUN_S', and a macro 
LO_URE_CURRENT_ENV, and modify cppumaker to generate constructor code as



#if defined LO_URE_CURRENT_ENV  defined LO_URE_CTOR_ENV_S' \
 defined LO_URE_CTOR_FUNS'  LO_URE_CURRENT_ENV == LO_URE_CTOR_ENV_S'

extern C cppu::ConstructorFunction_type LO_URE_CTOR_FUNS';

static css::uno::ReferenceX S::create(
css::uno::Referencecss::uno::XComponentContext const  the_context)
{
return LO_URE_CTOR_FUNS'(
the_context, css::uno::Sequencecss::uno::Any());
}

#else

// ... existing code ...

#endif


and

** when compiling .cxx files for which the env in which they will be run 
is statically known (which could e.g. be the case for /every/ .cxx file 
for Android/iOS when we restrict ourselves to just that env there, as we 
already effectively do), pass -DLO_URE_CURRENT_ENV=...


** when compiling .cxx files for which it is known that the constructor 
function for some S will be visible (which could e.g. be ~always the 
case when compiling for a single big executable on Android/iOS), define 
the LO_URE_CTOR_ENV_S' and LO_URE_CTOR_FUN_S' macros, either via -D 
or via some strategically included header


where S' is some schema to convert UNOIDL service/singleton names into 
legal yet unambiguous parts of C++ identifiers, and the encoding of 
environments (which are normally strings) in LO_URE_CURRENT_ENV and 
LO_URE_CTOR_ENV_S' macros must be such that they can be used in the 
preprocessor == expression above


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

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

 cppuhelper/source/shlib.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 023e49921e11644b65af66996fd033c533f589f9
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 19 10:56:58 2013 +0100

Legacy cppu::loadSharedLibComponentFactory isn't DISABLE_DYNLOADING cond.

Change-Id: I020d4fc382470d7bc08df9b88e42ac62c97cb47e

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index 972357b..fd88e5b 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -265,8 +265,6 @@ void cppuhelper::detail::loadSharedLibComponentFactory(
 #endif
 }
 
-#if !defined DISABLE_DYNLOADING
-
 css::uno::Referencecss::uno::XInterface cppu::loadSharedLibComponentFactory(
 rtl::OUString const  uri, rtl::OUString const  rPath,
 rtl::OUString const  rImplName,
@@ -282,6 +280,8 @@ css::uno::Referencecss::uno::XInterface 
cppu::loadSharedLibComponentFactory(
 return fac;
 }
 
+#if !defined DISABLE_DYNLOADING
+
 namespace {
 
 extern C void writeInfo(va_list * args) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit 3aac1ebd02795f30ebfe3ef7af6fdbcbf27e3e1f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 19 11:00:13 2013 +0100

Missing initialization

Change-Id: I177da4fbe87eacfb86b6196df3d023218b1c9012

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index fd88e5b..f34fa8e 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -189,7 +189,7 @@ void cppuhelper::detail::loadSharedLibComponentFactory(
 }
 rtl::OUString name(prefix == direct ? implementation : uri);
 lib_to_factory_mapping const * map = lo_get_factory_map();
-component_getFactoryFunc fp;
+component_getFactoryFunc fp = 0;
 for (int i = 0; map[i].name != 0; ++i) {
 if (name.equalsAscii(map[i].name)) {
 fp = map[i].component_getFactory_function;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Efficient UNO component linkage GC ...

 any instantiated object
 instances will continue to be disposed well ahead of exit via disposing the
 ComponentContext in desktop::Desktop::DeInit

BTW, please note that for the platforms where we do
DISABLE_DYNLOADING, a process that uses LibreOffice code (i.e. an iOS
or Android app) will never exit gracefully and intentionally, but
always be killed by the OS at a point in time when it is not active
and the OS needs its resources for other purposes. So for the
DISABLE_DYNLOADING case, tweaks to stuff that happens when LO exits
gracefully is fairly pointless. (Could still be useful for other
platforms, of course.) (Dunno if there is any possibility that
somebody would ever want to use DISABLE_DYNLOADING on more traditional
platforms.)

I wouldn't be surprised if this is the direction where apps in
desktop environments will be expected to evolve, too: No more exit
or quit functionality that the user would invoke. But we are not
there yet.

 * next step is to let certain occurrences of UNO service constructor (and
 singleton getter) calls in C++ code call corresponding constructor functions
 directly

This sounds lovely!

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

Re: registry and extension problems on master 4.3 Linux 64bit


On 12/18/2013 11:10 AM, Alex Thurgood wrote:

I noticed yesterday that the OSX build currently fails when trying to
download any of the extra extensions, including SmartDiag, from the host
where the oxygenoffice extras are hosted. However, this does not happen
on my Linux 64bit machine, and am at a loss to why that might be, other
than a problem with the Mac version of curl ?


I noticed in the past that downloading external stuff from 
http://ooo.itc.hu/oxygenoffice/download/libreoffice very often fails, 
apparently due to problems on the server side, independent of client OS. 
 Might be a coincidence that it succeeded when you tried on Linux (or 
did that build already find he files downloaded to external/tarballs/ 
from a previous build?) but failed when you tried on Mac.


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

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

2013-12-19 Thread Laurent Balland-Poirier

 source/text/schart/01/0405.xhp |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 0b0b8d6fbe77b6938b8e378217c3ca8b8588ee51
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Wed Dec 18 20:01:03 2013 +0100

Update Y error bars help page to also fit X error bars

Change-Id: I56fd5e196e84b97ad5505a60fda0260221aa0a9f
Reviewed-on: https://gerrit.libreoffice.org/7139
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/source/text/schart/01/0405.xhp 
b/source/text/schart/01/0405.xhp
index 644ec40..bf9865e 100644
--- a/source/text/schart/01/0405.xhp
+++ b/source/text/schart/01/0405.xhp
@@ -22,21 +22,21 @@

 meta
 topic id=textschart010405xml indexer=include status=PUBLISH
-title id=tit xml-lang=en-USY Error Bars/title
+title id=tit xml-lang=en-USX/Y Error Bars/title
 filename/text/schart/01/0405.xhp/filename
 /topic
 /meta
 body
 bookmark xml-lang=en-US branch=hid/.uno:InsertMenuYErrorBars 
id=bm_id877101 localize=false/
-paragraph role=heading id=hd_id3147428 xml-lang=en-US level=1 
l10n=CHG oldref=1link href=text/schart/01/0405.xhp name=Y Error 
BarsY Error Bars/link/paragraphcommenti85330/comment
-paragraph role=paragraph id=par_id3149666 xml-lang=en-US l10n=CHG 
oldref=2variable id=statistikahelp hid=.Use the emphY Error 
Bars/emph dialog to display error bars for 2D charts./ahelp
+paragraph role=heading id=hd_id3147428 xml-lang=en-US level=1 
l10n=CHG oldref=1link href=text/schart/01/0405.xhp name=Y Error 
BarsX/Y Error Bars/link/paragraphcommenti85330/comment
+paragraph role=paragraph id=par_id3149666 xml-lang=en-US l10n=CHG 
oldref=2variable id=statistikahelp hid=.Use the emphX or Y Error 
Bars/emph dialog to display error bars for 2D charts./ahelp
 /variable/paragraph
 embed href=text/schart/01/0403.xhp#context/
 section id=howtoget
 embed href=text/schart/00/0004.xhp#efgsta/
 /section
-paragraph role=paragraph id=par_id3401287 xml-lang=en-US l10n=NEWAn 
error bar is an indicator line that spans over a range from y - 
NegativeErrorValue to y + PositiveErrorValue. In this term, y is the value of 
the data point. When standard deviation is selected, y is the mean value of 
the data series. NegativeErrorValue and PositiveErrorValue are the amounts 
calculated by the error bar function or given explicitly./paragraph
-paragraph role=note id=par_id3153965 xml-lang=en-US l10n=CHG 
oldref=23The emphInsert - Y Error Bars/emph menu command is only 
available for 2D charts./paragraph
+paragraph role=paragraph id=par_id3401287 xml-lang=en-US l10n=NEWAn 
error bar is an indicator line that spans over a range from x/y - 
NegativeErrorValue to x/y + PositiveErrorValue. In this term, x or y is the 
value of the data point. When standard deviation is selected, x or y is the 
mean value of the data series. NegativeErrorValue and PositiveErrorValue are 
the amounts calculated by the error bar function or given 
explicitly./paragraph
+paragraph role=note id=par_id3153965 xml-lang=en-US l10n=CHG 
oldref=23The emphInsert - X/Y Error Bars/emph menu command is only 
available for 2D charts./paragraph
 paragraph role=heading id=hd_id3150344 xml-lang=en-US level=2 
l10n=U oldref=5Error category/paragraph
 paragraph role=paragraph id=par_id3150202 xml-lang=en-US l10n=CHG 
oldref=6In the emphError category/emph area, you can choose different 
ways to display the error category./paragraph
 !-- removed HID SCH:RADIOBUTTON:DLG_DATA_STAT:RBT_NONE --
@@ -90,7 +90,7 @@
 bookmark xml-lang=en-US 
branch=hid/CHART2_HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER id=bm_id8254646 
localize=false/
 paragraph role=paragraph id=par_id3872188 xml-lang=en-US 
l10n=NEWahelp hid=. visibility=hiddenClick a button to shrink the 
dialog, then use the mouse to select the cell range in the spreadsheet. Click 
the button again to restore the dialog to full size./ahelp/paragraph
 paragraph role=heading id=hd_id2633747 xml-lang=en-US level=3 
l10n=NEWFrom Data Table/paragraph
-paragraph role=paragraph id=par_id6633503 xml-lang=en-US 
l10n=NEWahelp hid=.For a chart with its own data, the error bar values 
can be entered in the chart data table. The Data Table dialog shows additional 
columns titled Positive Y-Error-Bars and Negative 
Y-Error-Bars./ahelp/paragraphcommentPositive (+)/comment
+paragraph role=paragraph id=par_id6633503 xml-lang=en-US 
l10n=NEWahelp hid=.For a chart with its own data, the error bar values 
can be entered in the chart data table. The Data Table dialog shows additional 
columns titled Positive X or Y-Error-Bars and Negative X or 
Y-Error-Bars./ahelp/paragraphcommentPositive (+)/comment
 bookmark xml-lang=en-US 
branch=hid/CHART2_HID_SCH_STATISTIK_POSITIVE_VALUE id=bm_id042820081035035 
localize=false/
 paragraph role=paragraph id=par_id0428200810573839 xml-lang=en-US 
l10n=NEWahelp hid=. visibility=hiddenEnter the value to

[Libreoffice-commits] core.git: helpcontent2

2013-12-19 Thread Laurent Balland-Poirier

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

New commits:
commit 207e0a3bcdf8f6f9e49b8639b260abe4e60f7460
Author: Laurent Balland-Poirier laurent.balland-poir...@laposte.net
Date:   Wed Dec 18 20:01:03 2013 +0100

Updated core
Project: help  0b0b8d6fbe77b6938b8e378217c3ca8b8588ee51

Update Y error bars help page to also fit X error bars

Change-Id: I56fd5e196e84b97ad5505a60fda0260221aa0a9f
Reviewed-on: https://gerrit.libreoffice.org/7139
Reviewed-by: Markus Mohrhard markus.mohrh...@googlemail.com
Tested-by: Markus Mohrhard markus.mohrh...@googlemail.com

diff --git a/helpcontent2 b/helpcontent2
index 37d4a61..0b0b8d6 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 37d4a61d6980cb62c580f94adc8595e6eb4c3fdd
+Subproject commit 0b0b8d6fbe77b6938b8e378217c3ca8b8588ee51
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Efficient UNO component linkage GC ...


On 12/19/2013 11:22 AM, Tor Lillqvist wrote:

any instantiated object
instances will continue to be disposed well ahead of exit via disposing the
ComponentContext in desktop::Desktop::DeInit


BTW, please note that for the platforms where we do
DISABLE_DYNLOADING, a process that uses LibreOffice code (i.e. an iOS
or Android app) will never exit gracefully and intentionally, but
always be killed by the OS at a point in time when it is not active
and the OS needs its resources for other purposes. So for the
DISABLE_DYNLOADING case, tweaks to stuff that happens when LO exits
gracefully is fairly pointless. (Could still be useful for other
platforms, of course.) (Dunno if there is any possibility that
somebody would ever want to use DISABLE_DYNLOADING on more traditional
platforms.)


noted; but this simplification of single-instance service/singleton 
construction will be relevant for the traditional platforms, too


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

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

 sw/source/filter/ww8/docxattributeoutput.cxx |   57 ++-
 sw/source/filter/ww8/docxsdrexport.cxx   |   65 +++
 sw/source/filter/ww8/docxsdrexport.hxx   |2 
 3 files changed, 74 insertions(+), 50 deletions(-)

New commits:
commit 9794a0db73b49f3c8b9e4b8348fe7dc9108d3435
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Dec 19 11:37:08 2013 +0100

DocxAttributeOutput::WriteDMLTextFrame: write effect list

We already had code for this, but only for pictures, factor out the
relevant code into its own method and call it here as well.

CppunitTest_sw_ooxmlexport's testTextFrameBorders is a reproducer for
this problem.

Change-Id: I3b71e64512a65c42a2f3859b4912a4408944e697

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6bcf8e6..ce985b8 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -465,6 +465,7 @@ void DocxAttributeOutput::WriteDMLTextFrame(sw::Frame* 
pParentFrame)
 m_pBodyPrAttrList = m_pSerializer-createAttrList();
 m_rExport.OutputFormat( pParentFrame-GetFrmFmt(), false, false, true );
 m_bDMLTextFrameSyntax = false;
+m_rExport.SdrExporter().writeDMLEffectLst(rFrmFmt);
 m_pSerializer-endElementNS(XML_wps, XML_spPr);
 
 m_rExport.mpParentFrame = NULL;
@@ -2922,18 +2923,6 @@ void DocxAttributeOutput::DefaultStyle( sal_uInt16 
nStyle )
 #endif
 }
 
-// Converts ARGB transparency (0..255) to drawingml alpha (opposite, and 
0..10)
-OString lcl_ConvertTransparency(const Color rColor)
-{
-if (rColor.GetTransparency()  0)
-{
-sal_Int32 nTransparencyPercent = 100 - float(rColor.GetTransparency()) 
/ 2.55;
-return OString::number(nTransparencyPercent * 
oox::drawingml::PER_PERCENT);
-}
-else
-return OString();
-}
-
 /* Writes a:srcRect tag back to document.xml if a file conatins a cropped 
image.
 *  NOTE : Tested on images of type JPEG,EMF/WMF,BMP, PNG and GIF.
 */
@@ -3132,44 +3121,7 @@ void DocxAttributeOutput::FlyFrameGraphic( const 
SwGrfNode* pGrfNode, const Size
 FSEND );
 m_pSerializer-endElementNS( XML_a, XML_ln );
 
-// Output effects
-SvxShadowItem aShadowItem = pFrmFmt-GetShadow();
-if ( aShadowItem.GetLocation() != SVX_SHADOW_NONE )
-{
-// Distance is measured diagonally from corner
-double nShadowDist = 
sqrt((aShadowItem.GetWidth()*aShadowItem.GetWidth())*2.0);
-OString aShadowDist( OString::number( TwipsToEMU( nShadowDist ) ) );
-OString aShadowColor = msfilter::util::ConvertColor( 
aShadowItem.GetColor() );
-OString aShadowAlpha = lcl_ConvertTransparency(aShadowItem.GetColor());
-sal_uInt32 nShadowDir = 0;
-switch ( aShadowItem.GetLocation() )
-{
-case SVX_SHADOW_TOPLEFT: nShadowDir = 1350; break;
-case SVX_SHADOW_TOPRIGHT: nShadowDir = 1890; break;
-case SVX_SHADOW_BOTTOMLEFT: nShadowDir = 810; break;
-case SVX_SHADOW_BOTTOMRIGHT: nShadowDir = 270; break;
-case SVX_SHADOW_NONE:
-case SVX_SHADOW_END:
-break;
-}
-OString aShadowDir( OString::number( nShadowDir ) );
-
-m_pSerializer-startElementNS( XML_a, XML_effectLst, FSEND );
-m_pSerializer-startElementNS( XML_a, XML_outerShdw,
-   XML_dist, aShadowDist.getStr(),
-   XML_dir, aShadowDir.getStr(), FSEND );
-if (aShadowAlpha.isEmpty())
-m_pSerializer-singleElementNS( XML_a, XML_srgbClr,
-XML_val, aShadowColor.getStr(), 
FSEND );
-else
-{
-m_pSerializer-startElementNS(XML_a, XML_srgbClr, XML_val, 
aShadowColor.getStr(), FSEND);
-m_pSerializer-singleElementNS(XML_a, XML_alpha, XML_val, 
aShadowAlpha.getStr(), FSEND);
-m_pSerializer-endElementNS(XML_a, XML_srgbClr);
-}
-m_pSerializer-endElementNS( XML_a, XML_outerShdw );
-m_pSerializer-endElementNS( XML_a, XML_effectLst );
-}
+m_rExport.SdrExporter().writeDMLEffectLst(*pFrmFmt);
 
 m_pSerializer-endElementNS( XML_pic, XML_spPr );
 
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx 
b/sw/source/filter/ww8/docxsdrexport.cxx
index f04d653..e030a81 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -21,6 +21,7 @@
 #include svx/svdogrp.hxx
 #include oox/token/tokens.hxx
 #include oox/export/drawingml.hxx
+#include oox/drawingml/drawingmltypes.hxx
 #include oox/export/utils.hxx
 #include oox/export/vmlexport.hxx
 
@@ -383,6 +384,70 @@ void DocxSdrExport::writeDMLAndVMLDrawing(const SdrObject* 
sdrObj, const SwFrmFm
 writeVMLDrawing(sdrObj, rFrmFmt, rNdTopLeft);
 }
 
+// Converts ARGB transparency (0..255) to

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

2013-12-19 Thread Muthu Subramanian

 oox/source/export/drawingml.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 05bf939a5855a973ab6f5c70c44c210daa280908
Author: Muthu Subramanian sumu...@collabora.com
Date:   Thu Dec 19 16:48:20 2013 +0530

n#828390: Bullet sizes set wrong.

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 6a0d65b..a338170 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1130,7 +1130,7 @@ void DrawingML::WriteParagraphNumbering( Reference 
XPropertySet  rXPropSet, sa
 } else {
 if( nBulletRelSize  nBulletRelSize != 100 )
 mpFS-singleElementNS( XML_a, XML_buSzPct,
-   XML_val, IS( std::min( 
(sal_Int32)25000, std::max( (sal_Int32)40, 1000*( (sal_Int32)nBulletRelSize 
) ) ) ), FSEND );
+   XML_val, IS( std::max( 
(sal_Int32)25000, std::min( (sal_Int32)40, 1000*( (sal_Int32)nBulletRelSize 
) ) ) ), FSEND );
 if( bHasFontDesc )
 mpFS-singleElementNS( XML_a, XML_buFont,
XML_typeface, 
OUStringToOString( aFontDesc.Name, RTL_TEXTENCODING_UTF8 ).getStr(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-12-19 Thread Muthu Subramanian

 oox/source/export/drawingml.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8f0f3b0154f915cd2e9eea2907dcc1e117854760
Author: Muthu Subramanian sumu...@collabora.com
Date:   Thu Dec 19 16:48:20 2013 +0530

n#828390: Bullet sizes set wrong.

diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index ff3f62a..3986989 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -1102,7 +1102,7 @@ void DrawingML::WriteParagraphNumbering( Reference 
XPropertySet  rXPropSet, sa
 } else {
 if( nBulletRelSize  nBulletRelSize != 100 )
 mpFS-singleElementNS( XML_a, XML_buSzPct,
-   XML_val, IS( std::min( 
(sal_Int32)25000, std::max( (sal_Int32)40, 1000*( (sal_Int32)nBulletRelSize 
) ) ) ), FSEND );
+   XML_val, IS( std::max( 
(sal_Int32)25000, std::min( (sal_Int32)40, 1000*( (sal_Int32)nBulletRelSize 
) ) ) ), FSEND );
 if( bHasFontDesc )
 mpFS-singleElementNS( XML_a, XML_buFont,
XML_typeface, 
OUStringToOString( aFontDesc.Name, RTL_TEXTENCODING_UTF8 ).getStr(),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 desktop/source/app/langselect.cxx |   13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 03e7a16fe2802160b8344058f225a57bdb9c59f5
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 19 12:24:31 2013 +0100

use proper LanguageTag fallback instead of dumb startsWith(), fdo#68714

A ca_ES@valencia (= ca-ES-valencia) locale did not result in
'ca-valencia' UI being selected but 'ca' only instead.

Change-Id: Ifa405add2ff7b45e030b02af4338de195b457cb2

diff --git a/desktop/source/app/langselect.cxx 
b/desktop/source/app/langselect.cxx
index 49d001a..291e708 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -58,20 +58,15 @@ OUString getInstalledLocale(
 return installed[i];
 }
 }
-// FIXME: It is not very clever to handle the zh-HK - zh-TW fallback here,
-// but right now, there is no place that handles those fallbacks globally:
-if (locale == zh-HK) {
+::std::vectorOUString fallbacks( LanguageTag( 
locale).getFallbackStrings( false));
+for (size_t f=0; f  fallbacks.size(); ++f) {
+const OUString rf = fallbacks[f];
 for (sal_Int32 i = 0; i != installed.getLength(); ++i) {
-if (installed[i] == zh-TW) {
+if (installed[i] == rf) {
 return installed[i];
 }
 }
 }
-for (sal_Int32 i = 0; i != installed.getLength(); ++i) {
-if (locale.startsWith(installed[i])) {
-return installed[i];
-}
-}
 return OUString();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 oox/source/drawingml/shape.cxx |   17 +
 1 file changed, 17 insertions(+)

New commits:
commit f9d868a5fedcd8e55b1537876e4457c1139bfa3c
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Dec 19 12:26:53 2013 +0100

oox: import drawingml border color for TextFrames

CppunitTest_sw_ooxmlexport's testTextFrameBorders is a reproducer for
this problem.

Change-Id: I0fdf6362fcc487a5002ef7f359dc4d4a1fb03616

diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 72c7547..a28b1b4 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -51,6 +51,7 @@
 #include com/sun/star/drawing/TextVerticalAdjust.hpp
 #include com/sun/star/drawing/GraphicExportFilter.hpp
 #include com/sun/star/text/XText.hpp
+#include com/sun/star/table/BorderLine2.hpp
 #include com/sun/star/chart2/XChartDocument.hpp
 #include com/sun/star/style/ParagraphAdjust.hpp
 #include com/sun/star/io/XOutputStream.hpp
@@ -625,6 +626,22 @@ Reference XShape  Shape::createAndInsert(
 aShapeProps.setProperty(PROP_BackColorTransparency, 
aShapeProps[PROP_FillTransparence]);
 aShapeProps.erase(PROP_FillTransparence);
 }
+// And no LineColor property; individual borders can have 
colors
+if (aShapeProps.hasProperty(PROP_LineColor))
+{
+uno::Referencebeans::XPropertySet xPropertySet(mxShape, 
uno::UNO_QUERY);
+static const sal_Int32 aBorders[] =
+{
+PROP_TopBorder, PROP_LeftBorder, PROP_BottomBorder, 
PROP_RightBorder
+};
+for (unsigned int i = 0; i  SAL_N_ELEMENTS(aBorders); ++i)
+{
+css::table::BorderLine2 aBorderLine = 
xPropertySet-getPropertyValue(PropertyMap::getPropertyName(aBorders[i])).getcss::table::BorderLine2();
+aBorderLine.Color = 
aShapeProps[PROP_LineColor].getsal_Int32();
+aShapeProps.setProperty(aBorders[i], 
uno::makeAny(aBorderLine));
+}
+aShapeProps.erase(PROP_LineColor);
+}
 }
 
 PropertySet( xSet ).setProperties( aShapeProps );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 21 commits - connectivity/source dbaccess/source hwpfilter/source sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk sfx2/source svtools/source

 connectivity/source/drivers/mork/MorkParser.cxx |   35 +++-
 dbaccess/source/ui/misc/WNameMatch.cxx  |8 -
 hwpfilter/source/hwpfile.cxx|   16 +-
 hwpfilter/source/hwpreader.cxx  |   18 --
 sc/AllLangResTarget_sc.mk   |1 
 sc/UIConfig_scalc.mk|1 
 sc/inc/sc.hrc   |2 
 sc/inc/scabstdlg.hxx|3 
 sc/source/ui/attrdlg/scdlgfact.cxx  |   19 --
 sc/source/ui/attrdlg/scdlgfact.hxx  |3 
 sc/source/ui/dbgui/subtdlg.cxx  |   25 +--
 sc/source/ui/dbgui/tpsubt.cxx   |1 
 sc/source/ui/inc/subtdlg.hrc|   37 -
 sc/source/ui/inc/subtdlg.hxx|5 
 sc/source/ui/src/subtdlg.src|   69 -
 sc/source/ui/view/cellsh1.cxx   |6 
 sc/uiconfig/scalc/ui/subtotaldialog.ui  |  176 
 sfx2/source/dialog/filtergrouping.cxx   |4 
 svtools/source/contnr/imivctl2.cxx  |   12 +
 sw/source/ui/index/cnttab.cxx   |9 -
 vcl/source/gdi/sallayout.cxx|3 
 writerfilter/source/dmapper/PropertyIds.cxx |7 
 writerfilter/source/dmapper/PropertyIds.hxx |2 
 23 files changed, 267 insertions(+), 195 deletions(-)

New commits:
commit 001bd53a18c3566ee92344d5f00f6b575c63f9fa
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 11:27:41 2013 +

CID#1038302 (unlikely) invalid iterator use

Change-Id: Iff61209eb840d5b6722b651580a77ae50d610460

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 6e0f9bf..8f5d5a1 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -1392,6 +1392,9 @@ int GenericSalLayout::GetNextGlyphs( int nLen, 
sal_GlyphId* pGlyphs, Point rPos
 if( nStart = (int)m_GlyphItems.size() )
 return 0;
 
+if( pG == pGEnd )
+return 0;
+
 // calculate absolute position in pixel units
 Point aRelativePos = pG-maLinearPos - maBasePoint;
 
commit 2f0a036745828dde5b2b63d4a59e5a6fd677e097
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 11:12:03 2013 +

CID#982610 inefficient iterator usage confusing coverity

Change-Id: I79142f5f1723fa2db0e729cb0dacb201e41077bc

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 15aa3bf..8347fd4 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -3444,16 +3444,8 @@ void HwpReader::makeTable(TxtBox * hbox)
 
 // --- cell  //
 int j = -1, k = -1;
-for (int i = 0 ; i  static_castint(tbl-cells.size()); i++)
+for (std::listTCell*::iterator it = tbl-cells.begin(), aEnd = 
tbl-cells.end(); it != aEnd; ++it)
 {
-std::listTCell*::iterator it = tbl-cells.begin();
-
-for( int ii = 0; it != tbl-cells.end(); ++it, ii++ )
-{
-if( ii == i )
-break;
-}
-
 TCell *tcell = *it;
 if( tcell-nRowIndex  j )
 {
commit 47bda1cfc9f31d95ee88fd56aaa3235e60270922
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 11:11:12 2013 +

fix indent

Change-Id: I68aae5b6059c0e7281e45d39eb94ce247c6dae47

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 7ed1500..15aa3bf 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -3448,10 +3448,11 @@ void HwpReader::makeTable(TxtBox * hbox)
 {
 std::listTCell*::iterator it = tbl-cells.begin();
 
-for( int ii = 0; it != tbl-cells.end(); ++it, ii++ ){
-if( ii == i )
-  break;
-}
+for( int ii = 0; it != tbl-cells.end(); ++it, ii++ )
+{
+if( ii == i )
+break;
+}
 
 TCell *tcell = *it;
 if( tcell-nRowIndex  j )
commit 976193c1b6d625ab8afa6efc2997ea7771304a83
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 11:10:09 2013 +

CID#982609 inefficient iterator usage confusing coverity

Change-Id: I9f170cc8c36fe89e596ee703231ba8abff5564c5

diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index e9f0f3b..7ed1500 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -1901,16 +1901,8 @@ void HwpReader::makeTableStyle(Table *tbl)
 }
 
 // --- cell - //
-for (int i = 0 ; i  static_castint(tbl-cells.size()); i++)
+for (std::listTCell*::iterator it = tbl-cells.begin(), aEnd = 
tbl-cells.end(); it != aEnd; ++it)
 {
-std::listTCell*::iterator it = tbl-cells.begin();
-
-for( int ii = 0; it != tbl-cells.end(); ++it, ii++ )
-{
-if( ii == i )
-break;
-}
-
 TCell *tcell = *it;

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - desktop/source

 desktop/source/app/langselect.cxx |   13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 8b48c8d1ac7b2a4ef557b9e004a772fa0a6ade71
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 19 12:24:31 2013 +0100

use proper LanguageTag fallback instead of dumb startsWith(), fdo#68714

A ca_ES@valencia (= ca-ES-valencia) locale did not result in
'ca-valencia' UI being selected but 'ca' only instead.

Change-Id: Ifa405add2ff7b45e030b02af4338de195b457cb2
(cherry picked from commit 03e7a16fe2802160b8344058f225a57bdb9c59f5)

diff --git a/desktop/source/app/langselect.cxx 
b/desktop/source/app/langselect.cxx
index 49d001a..291e708 100644
--- a/desktop/source/app/langselect.cxx
+++ b/desktop/source/app/langselect.cxx
@@ -58,20 +58,15 @@ OUString getInstalledLocale(
 return installed[i];
 }
 }
-// FIXME: It is not very clever to handle the zh-HK - zh-TW fallback here,
-// but right now, there is no place that handles those fallbacks globally:
-if (locale == zh-HK) {
+::std::vectorOUString fallbacks( LanguageTag( 
locale).getFallbackStrings( false));
+for (size_t f=0; f  fallbacks.size(); ++f) {
+const OUString rf = fallbacks[f];
 for (sal_Int32 i = 0; i != installed.getLength(); ++i) {
-if (installed[i] == zh-TW) {
+if (installed[i] == rf) {
 return installed[i];
 }
 }
 }
-for (sal_Int32 i = 0; i != installed.getLength(); ++i) {
-if (locale.startsWith(installed[i])) {
-return installed[i];
-}
-}
 return OUString();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sfx2/source/dialog/filtergrouping.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3b936b35289588af5732a26682a9cf57a5e621b4
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 11:43:45 2013 +

WaE: equality comparison result unused

Change-Id: I051854a39c0907f4b88217b66db6560b81b73494

diff --git a/sfx2/source/dialog/filtergrouping.cxx 
b/sfx2/source/dialog/filtergrouping.cxx
index 2ef1cd5..385f11e 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -661,7 +661,7 @@ namespace sfx2
 
 assert(aCurrentGroup != _rAllFilters.end()); //invalid current 
group!
 if (aCurrentGroup == _rAllFilters.end())
-aCurrentGroup == _rAllFilters.begin();
+aCurrentGroup = _rAllFilters.begin();
 
 // ===
 // check if the filter is part of a global group
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-12-19 Thread Noel Grandin

 sd/source/filter/html/htmlex.cxx |  155 +++
 sd/source/filter/html/htmlex.hxx |   10 +-
 2 files changed, 65 insertions(+), 100 deletions(-)

New commits:
commit 3bbf357e58958c69de7aaf63d5a618a0310c3246
Author: Noel Grandin n...@peralex.com
Date:   Thu Dec 12 12:03:38 2013 +0200

convert OUString** in HtmlExport to std::vectorOUString

There is no point in storing pointers to a ref-counted value type like
OUString.
And while we're there, convert arrays to std::vector

Change-Id: I96ceeb13dd3c4fb4f2ebdd017edc92d01dcb47cb
Reviewed-on: https://gerrit.libreoffice.org/7044
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 4e6ad03..eb166b2 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -369,11 +369,6 @@ HtmlExport::HtmlExport(
 mbUserAttr(false),
 mbDocColors(false),
 maHTMLExtension(SdResId(STR_HTMLEXP_DEFAULT_EXTENSION)),
-mpHTMLFiles(NULL),
-mpImageFiles(NULL),
-mpThumbnailFiles(NULL),
-mpPageNames(NULL),
-mpTextFiles(NULL),
 maIndexUrl(index),
 meScript( SCRIPT_ASP ),
 maHTMLHeader(
@@ -407,26 +402,6 @@ HtmlExport::HtmlExport(
 
 HtmlExport::~HtmlExport()
 {
-// --
-// delete lists
-// --
-if(mpImageFiles  mpHTMLFiles  mpThumbnailFiles  mpPageNames  
mpTextFiles )
-{
-for ( sal_uInt16 nSdPage = 0; nSdPage  mnSdPageCount; nSdPage++)
-{
-delete mpImageFiles[nSdPage];
-delete mpHTMLFiles[nSdPage];
-delete mpThumbnailFiles[nSdPage];
-delete mpPageNames[nSdPage];
-delete mpTextFiles[nSdPage];
-}
-}
-
-delete[] mpImageFiles;
-delete[] mpHTMLFiles;
-delete[] mpThumbnailFiles;
-delete[] mpPageNames;
-delete[] mpTextFiles;
 }
 
 /** get common export parameters from item set */
@@ -985,9 +960,9 @@ bool HtmlExport::CreateImagesForPresPages( bool bThumbnail)
 
 OUString aFull(maExportPath);
 if (bThumbnail)
-aFull += *mpThumbnailFiles[nSdPage];
+aFull += maThumbnailFiles[nSdPage];
 else
-aFull += *mpImageFiles[nSdPage];
+aFull += maImageFiles[nSdPage];
 
 
 aDescriptor[0].Value = aFull;
@@ -1065,7 +1040,7 @@ bool HtmlExport::CreateHtmlTextForPresPages()
 OUStringBuffer aStr(maHTMLHeader);
 aStr.append(CreateMetaCharset());
 aStr.append(  title);
-aStr.append(StringToHTMLString(*mpPageNames[nSdPage]));
+aStr.append(StringToHTMLString(maPageNames[nSdPage]));
 aStr.append(/title\r\n);
 aStr.append(/head\r\n);
 aStr.append(CreateBodyTag());
@@ -1103,7 +1078,7 @@ bool HtmlExport::CreateHtmlTextForPresPages()
 // clsoe page
 aStr.append(/body\r\n/html);
 
-bOk = WriteHtml(*mpTextFiles[nSdPage], false, 
aStr.makeStringAndClear());
+bOk = WriteHtml(maTextFiles[nSdPage], false, 
aStr.makeStringAndClear());
 
 if (mpProgress)
 mpProgress-SetState(++mnPagesWritten);
@@ -1491,7 +1466,7 @@ bool HtmlExport::CreateHtmlForPresPages()
 // HTML Head
 OUStringBuffer aStr(maHTMLHeader);
 aStr.append(CreateMetaCharset());
-aStr.append(  title + StringToHTMLString(*mpPageNames[nSdPage]) + 
/title\r\n);
+aStr.append(  title + StringToHTMLString(maPageNames[nSdPage]) + 
/title\r\n);
 
 // insert timing information
 pPage = maPages[ nSdPage ];
@@ -1525,7 +1500,7 @@ bool HtmlExport::CreateHtmlForPresPages()
 if( nPage == mnSdPageCount )
 nPage = 0;
 
-aStr.append(*mpHTMLFiles[nPage]);
+aStr.append(maHTMLFiles[nPage]);
 
 aStr.append(\\r\n);
 }
@@ -1546,7 +1521,7 @@ bool HtmlExport::CreateHtmlForPresPages()
 // Image
 aStr.append(center);
 aStr.append(img src=\);
-aStr.append(*mpImageFiles[nSdPage]);
+aStr.append(maImageFiles[nSdPage]);
 aStr.append(\ alt=\\);
 
 if (!aClickableObjects.empty())
@@ -1798,7 +1773,7 @@ bool HtmlExport::CreateHtmlForPresPages()
 
 aStr.append(/body\r\n/html);
 
-bOk = WriteHtml(*mpHTMLFiles[nSdPage], false, 
aStr.makeStringAndClear());
+bOk = WriteHtml(maHTMLFiles[nSdPage], false, 
aStr.makeStringAndClear());
 
 if (mpProgress)
 mpProgress-SetState(++mnPagesWritten);
@@ -1819,7 +1794,7 @@ bool HtmlExport::CreateContentPage()
 OUStringBuffer aStr(maHTMLHeader);
 aStr.append(CreateMetaCharset());
 aStr.append(  title);
-

Re: Make error for barcode extension

2013-12-19 Thread Marina Latini

Hi All,
yes, now the download works fine. My internet connection is ok, the download of 
the other tarballs works. there was a problem with ooo.itc.hu. Two users on 
libreoffice-dev irc channel told me that this site often has connection 
problems.

Thank you for your time.
Have a nice day,
Marina


Marina Latini 
mar...@studiostorti.com

Studio Storti Srl
Viale Leonardo da Vinci, 18
36100 - Vicenza (VI)
http://www.studiostorti.com


- Messaggio originale -
Da: Noel Grandin n...@peralex.com
A: Marina Latini mar...@studiostorti.com, libreoffice@lists.freedesktop.org
Inviato: Giovedì, 19 dicembre 2013 7:53:38
Oggetto: Re: Make error for barcode extension

On 2013-12-18 14:40, Marina Latini wrote:
 Risoluzione di ooo.itc.hu (ooo.itc.hu)... 91.208.36.36
 Connessione a ooo.itc.hu (ooo.itc.hu)|91.208.36.36|:80... fallito: 
 Connessione rifiutata.


That looks like an internet connectivity problem.
Either your proxy stuff is not configured correctly, or the website on the 
other end was temporarily refusing connections.
I've just checked, and I can download that file now.

Disclaimer: http://www.peralex.com/disclaimer.html

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

[Libreoffice-commits] core.git: 4 commits - include/svx sc/AllLangResTarget_sc.mk sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk svx/source sw/source

 include/svx/rubydialog.hxx |   13 +--
 sc/AllLangResTarget_sc.mk  |1 
 sc/UIConfig_scalc.mk   |1 
 sc/inc/sc.hrc  |2 
 sc/inc/scabstdlg.hxx   |3 
 sc/source/ui/attrdlg/scdlgfact.cxx |   18 -
 sc/source/ui/attrdlg/scdlgfact.hxx |3 
 sc/source/ui/dbgui/sortdlg.cxx |   32 ++--
 sc/source/ui/dbgui/sortkeydlg.cxx  |1 
 sc/source/ui/dbgui/tpsort.cxx  |3 
 sc/source/ui/inc/sortdlg.hrc   |   35 -
 sc/source/ui/inc/sortdlg.hxx   |   19 +
 sc/source/ui/inc/sortkeydlg.hxx|1 
 sc/source/ui/inc/tpsort.hxx|4 -
 sc/source/ui/src/sortdlg.src   |   77 -
 sc/source/ui/view/cellsh2.cxx  |8 +-
 sc/uiconfig/scalc/ui/sortdialog.ui |  133 +
 svx/source/dialog/rubydialog.cxx   |   16 ++--
 sw/source/ui/index/cnttab.cxx  |4 +
 19 files changed, 174 insertions(+), 200 deletions(-)

New commits:
commit 7715f7e6b941a5b4bcde326c77647cd00c647a0b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 12:01:58 2013 +

CID#703891 RubyDialog::GetText orthogonal to Dialog::GetText

Change-Id: I131daae13b11b5242e9a32a94532463f6e0d925b

diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx
index e8cf275..0afca8c 100644
--- a/include/svx/rubydialog.hxx
+++ b/include/svx/rubydialog.hxx
@@ -87,9 +87,6 @@ public:
 
 class SvxRubyDialog : public SfxModelessDialog
 {
-using Dialog::SetText;
-using Dialog::GetText;
-
 friend class RubyPreview;
 
 FixedText*  m_pLeftFT;
@@ -123,7 +120,7 @@ class SvxRubyDialog : public SfxModelessDialog
 longnLastPos;
 longnCurrentEdit;
 
-sal_BoolbModified;
+sal_BoolbModified;
 
 
com::sun::star::uno::Referencecom::sun::star::view::XSelectionChangeListener 
xImpl;
 SfxBindings*pBindings;
@@ -140,18 +137,18 @@ class SvxRubyDialog : public SfxModelessDialog
 DECL_LINK(EditScrollHdl_Impl, sal_Int32*);
 DECL_LINK(EditJumpHdl_Impl, sal_Int32*);
 
-voidSetText(sal_Int32 nPos, Edit rLeft, Edit rRight);
-voidGetText();
+voidSetRubyText(sal_Int32 nPos, Edit rLeft, Edit rRight);
+voidGetRubyText();
 voidClearCharStyleList();
 voidAssertOneEntry();
 
 voidUpdate();
-virtual sal_BoolClose();
+virtual sal_BoolClose();
 
 longGetLastPos() const {return nLastPos;}
 voidSetLastPos(long nSet) {nLastPos = nSet;}
 
-sal_BoolIsModified() const {return bModified;}
+sal_BoolIsModified() const {return bModified;}
 voidSetModified(sal_Bool bSet) {bModified = bSet;}
 
 void EnableControls(bool bEnable);
diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx
index cb6db3c..2e113dc 100644
--- a/svx/source/dialog/rubydialog.cxx
+++ b/svx/source/dialog/rubydialog.cxx
@@ -373,7 +373,7 @@ voidSvxRubyDialog::Deactivate()
 SfxModelessDialog::Deactivate();
 }
 
-void SvxRubyDialog::SetText(sal_Int32 nPos, Edit rLeft, Edit rRight)
+void SvxRubyDialog::SetRubyText(sal_Int32 nPos, Edit rLeft, Edit rRight)
 {
 OUString sLeft, sRight;
 const SequencePropertyValues  aRubyValues = pImpl-GetRubyValues();
@@ -400,7 +400,7 @@ void SvxRubyDialog::SetText(sal_Int32 nPos, Edit rLeft, 
Edit rRight)
 rRight.SaveValue();
 }
 //-
-void SvxRubyDialog::GetText()
+void SvxRubyDialog::GetRubyText()
 {
 long nTempLastPos = GetLastPos();
 for(int i = 0; i  8; i+=2)
@@ -515,12 +515,12 @@ IMPL_LINK(SvxRubyDialog, ScrollHdl_Impl, ScrollBar*, 
pScroll)
 long nPos = pScroll-GetThumbPos();
 if(GetLastPos() != nPos)
 {
-GetText();
+GetRubyText();
 }
-SetText(nPos++, *m_pLeft1ED, *m_pRight1ED);
-SetText(nPos++, *m_pLeft2ED, *m_pRight2ED);
-SetText(nPos++, *m_pLeft3ED, *m_pRight3ED);
-SetText(nPos, *m_pLeft4ED, *m_pRight4ED);
+SetRubyText(nPos++, *m_pLeft1ED, *m_pRight1ED);
+SetRubyText(nPos++, *m_pLeft2ED, *m_pRight2ED);
+SetRubyText(nPos++, *m_pLeft3ED, *m_pRight3ED);
+SetRubyText(nPos, *m_pLeft4ED, *m_pRight4ED);
 SetLastPos(nPos - 3);
 m_pPreviewWin-Invalidate();
 return 0;
@@ -536,7 +536,7 @@ IMPL_LINK_NOARG(SvxRubyDialog, ApplyHdl_Impl)
 AdjustHdl_Impl(m_pAdjustLB);
 CharStyleHdl_Impl(m_pCharStyleLB);
 }
-GetText();
+GetRubyText();
 //reset all edit fields - SaveValue is called
 ScrollHdl_Impl(m_pScrollSB);
 
commit 3b6891ff6fa92bf64b8013181999e44d6dfb0b01
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 11:51:43 2013 +

CID#1130380 (unlikely) invalid iterator use

Change-Id:

FDO/Bugzilla Outages: Technical difficulties, please stand by

2013-12-19 Thread Robinson Tryon

The FDO site has been sporadically unavailable for the last hour or
so. Anything that interacts with Freedesktop.org Bugzilla may be
affected, including

- Bugzilla
- The BSA
- IZBot
- EasyHacks wiki pages
- Other collections of bug reports on wiki pages
- The bug-reporter tool
- The MAB tool
- etc...

NOTE: If you're filing or editing bugs in Bugzilla, please confirm
that your edits are *fully saved* before leaving the page. If you get
a timeout error, you can usually just hit the back button in your
browser and rescue all of your data.

If you do hit a timeout or other bug, I *wholeheartedly* recommend
that you don't keep on trying to save the tab w/data in it (which
might result in some loss), but instead open a 2nd tab in your browser
and test FDO every minute or two until it's back up. Once the site is
up, promptly save the edits that have been hanging out in your 1st
tab.

If I hear any updates from FDO, I'll let you know.

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

Re: libebook filter sniffing cost ...

2013-12-19 Thread David Tardon

Hi,

On Thu, Dec 12, 2013 at 10:02:57AM +, Michael Meeks wrote:
   Thoughts appreciated though; is there some ordering of sniffing such
 that we can prioritize common formats over less common ones ? and has
 perhaps libebook got into that stack too high up ?

I think the filters are tried by their occurence in the configuration.
If that is really the case, we could implement simple ordering based on
filter flags, e.g., decrease priority for ALIEN and 3RDPARTYFILTER and
increase it for filters that are both IMPORT and EXPORT. That would put
.odt before .docx and that before .fb2 (which is the one from libe-book
that checks for zip content).

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

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

 sw/inc/swabstdlg.hxx  |   10 +-
 sw/source/ui/dialog/swdlgfact.cxx |   14 +++---
 sw/source/ui/dialog/swdlgfact.hxx |   10 +-
 sw/source/ui/fldui/javaedit.cxx   |2 +-
 sw/source/ui/inc/javaedit.hxx |   14 +-
 sw/source/ui/shells/textfld.cxx   |4 ++--
 6 files changed, 25 insertions(+), 29 deletions(-)

New commits:
commit 5f273ff915ddad362afe9134aba460999c44c939
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 12:13:32 2013 +

CID#703893 SwJavaEditDialog::Get[Text|Type] orthogonal to Dialog::Get*

and const up

Change-Id: I9bb363b26efaf83e36187df4bf762d64b3956ed1

diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index d7b81e8..a6bfa51 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -130,11 +130,11 @@ public:
 class AbstractJavaEditDialog : public VclAbstractDialog
 {
 public:
-virtual OUStringGetText() = 0;
-virtual OUStringGetType() = 0;
-virtual sal_BoolIsUrl() = 0;
-virtual sal_BoolIsNew() = 0;
-virtual boolIsUpdate() = 0;
+virtual OUStringGetScriptText() const = 0;
+virtual OUStringGetScriptType() const = 0;
+virtual sal_BoolIsUrl() const = 0;
+virtual sal_BoolIsNew() const = 0;
+virtual boolIsUpdate() const = 0;
 };
 
 class AbstractMailMergeDlg : public VclAbstractDialog
diff --git a/sw/source/ui/dialog/swdlgfact.cxx 
b/sw/source/ui/dialog/swdlgfact.cxx
index e337589..c363300 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -451,27 +451,27 @@ void AbstractInsTableDlg_Impl::GetValues( OUString 
rName, sal_uInt16 rRow, sal
 pDlg-GetValues( rName, rRow, rCol, rInsTblFlags, rTableAutoFmtName, 
prTAFmt);
 }
 
-OUString AbstractJavaEditDialog_Impl::GetText()
+OUString AbstractJavaEditDialog_Impl::GetScriptText() const
 {
-return pDlg-GetText();
+return pDlg-GetScriptText();
 }
 
-OUString AbstractJavaEditDialog_Impl::GetType()
+OUString AbstractJavaEditDialog_Impl::GetScriptType() const
 {
-return pDlg-GetType();
+return pDlg-GetScriptType();
 }
 
-sal_Bool AbstractJavaEditDialog_Impl::IsUrl()
+sal_Bool AbstractJavaEditDialog_Impl::IsUrl() const
 {
 return pDlg-IsUrl();
 }
 
-sal_Bool AbstractJavaEditDialog_Impl::IsNew()
+sal_Bool AbstractJavaEditDialog_Impl::IsNew() const
 {
 return pDlg-IsNew();
 }
 
-bool AbstractJavaEditDialog_Impl::IsUpdate()
+bool AbstractJavaEditDialog_Impl::IsUpdate() const
 {
 return pDlg-IsUpdate();
 }
diff --git a/sw/source/ui/dialog/swdlgfact.hxx 
b/sw/source/ui/dialog/swdlgfact.hxx
index de45486..e025c48 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -273,11 +273,11 @@ class SwJavaEditDialog;
 class AbstractJavaEditDialog_Impl : public AbstractJavaEditDialog
 {
 DECL_ABSTDLG_BASE(AbstractJavaEditDialog_Impl,SwJavaEditDialog)
-virtual OUStringGetText();
-virtual OUStringGetType();
-virtual sal_BoolIsUrl();
-virtual sal_BoolIsNew();
-virtual boolIsUpdate();
+virtual OUStringGetScriptText() const;
+virtual OUStringGetScriptType() const;
+virtual sal_BoolIsUrl() const;
+virtual sal_BoolIsNew() const;
+virtual boolIsUpdate() const;
 };
 
 class SwMailMergeDlg;
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 5dcbd0d..f59a477 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -220,7 +220,7 @@ void SwJavaEditDialog::SetFld()
 aType = JavaScript;
 }
 
-bool SwJavaEditDialog::IsUpdate()
+bool SwJavaEditDialog::IsUpdate() const
 {
 return pFld  ( bIsUrl != pFld-GetFormat() || pFld-GetPar2() != aType 
|| pFld-GetPar1() != aText );
 }
diff --git a/sw/source/ui/inc/javaedit.hxx b/sw/source/ui/inc/javaedit.hxx
index 569362e..209c39a 100644
--- a/sw/source/ui/inc/javaedit.hxx
+++ b/sw/source/ui/inc/javaedit.hxx
@@ -70,23 +70,19 @@ private:
 voidCheckTravel();
 voidSetFld();
 
-using Dialog::GetText;
-using Window::GetType;
-
 public:
 SwJavaEditDialog(Window* pParent, SwWrtShell* pWrtSh);
 ~SwJavaEditDialog();
 
-OUString   GetText() { return aText; }
+OUString GetScriptText() const { return aText; }
 
-OUString   GetType() { return aType; }
+OUString GetScriptType() const { return aType; }
 
-sal_BoolIsUrl() { return bIsUrl; }
-sal_BoolIsNew() { return bNew; }
-boolIsUpdate();
+sal_Bool IsUrl() const { return bIsUrl; }
+sal_Bool IsNew() const { return bNew; }
+bool IsUpdate() const;
 };
 
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/shells/textfld.cxx

[Libreoffice-commits] core.git: sd/qa

2013-12-19 Thread Muthu Subramanian

 sd/qa/unit/data/n828390_5.odp |binary
 sd/qa/unit/import-tests.cxx   |   26 ++
 2 files changed, 26 insertions(+)

New commits:
commit 3b9b2e2d98ee3eb10dfdcbc27c5ead40f0335cb7
Author: Muthu Subramanian sumu...@collabora.com
Date:   Thu Dec 19 18:14:47 2013 +0530

n#828390: Unit test for bullet's relative size.

diff --git a/sd/qa/unit/data/n828390_5.odp b/sd/qa/unit/data/n828390_5.odp
new file mode 100644
index 000..29cb8af
Binary files /dev/null and b/sd/qa/unit/data/n828390_5.odp differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 31b9e7b..cd6f9b0 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -18,6 +18,7 @@
 #include editeng/colritem.hxx
 #include editeng/fontitem.hxx
 #include editeng/wghtitem.hxx
+#include editeng/numitem.hxx
 #include rsc/rscsfx.hxx
 
 #include svx/svdotext.hxx
@@ -54,6 +55,7 @@ public:
 void testN828390_2();
 void testN828390_3();
 void testN828390_4();
+void testN828390_5();
 void testFdo68594();
 
 CPPUNIT_TEST_SUITE(SdFiltersTest);
@@ -67,6 +69,7 @@ public:
 CPPUNIT_TEST(testN828390_2);
 CPPUNIT_TEST(testN828390_3);
 CPPUNIT_TEST(testN828390_4);
+CPPUNIT_TEST(testN828390_5);
 CPPUNIT_TEST(testFdo68594);
 
 CPPUNIT_TEST_SUITE_END();
@@ -326,6 +329,29 @@ void SdFiltersTest::testN828390_4()
 CPPUNIT_ASSERT(bPassed);
 }
 
+void SdFiltersTest::testN828390_5()
+{
+::sd::DrawDocShellRef xDocShRef = loadURL( 
getURLFromSrc(/sd/qa/unit/data/n828390_5.odp) );
+CPPUNIT_ASSERT_MESSAGE( failed to load, xDocShRef.Is() );
+
+xDocShRef = saveAndReload( xDocShRef, PPTX );
+CPPUNIT_ASSERT_MESSAGE( failed to load, xDocShRef.Is() );
+CPPUNIT_ASSERT_MESSAGE( not in destruction, 
!xDocShRef-IsInDestruction() );
+
+SdDrawDocument *pDoc = xDocShRef-GetDoc();
+CPPUNIT_ASSERT_MESSAGE( no document, pDoc != NULL );
+const SdrPage *pPage = pDoc-GetPage(1);
+CPPUNIT_ASSERT_MESSAGE( no page, pPage != NULL );
+{
+SdrObject *pObj = pPage-GetObj(0);
+SdrTextObj *pTxtObj = dynamic_castSdrTextObj *( pObj );
+const EditTextObject aEdit = 
pTxtObj-GetOutlinerParaObject()-GetTextObject();
+const SvxNumBulletItem *pNumFmt = dynamic_castconst SvxNumBulletItem 
*(aEdit.GetPool()-GetItem2(EE_PARA_NUMBULLET, 5));
+CPPUNIT_ASSERT( pNumFmt );
+CPPUNIT_ASSERT_MESSAGE( Bullet's relative size is wrong!, 
pNumFmt-GetNumRule()-GetLevel(1).GetBulletRelSize() == 75 ); // != 25
+}
+}
+
 void SdFiltersTest::testN778859()
 {
 ::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc(/sd/qa/unit/data/pptx/n778859.pptx));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com offapi/UnoApi_offapi.mk oox/source sax/qa writerfilter/source

 offapi/UnoApi_offapi.mk |1 
 offapi/com/sun/star/xml/sax/FastParser.idl  |   23 ++
 offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl |4 -
 oox/source/core/fastparser.cxx  |6 +
 oox/source/crypto/DocumentDecryption.cxx|9 --
 sax/qa/cppunit/parser.cxx   |7 --
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx   |   53 
 writerfilter/source/ooxml/factoryimpl.xsl   |   11 ---
 8 files changed, 53 insertions(+), 61 deletions(-)

New commits:
commit 71eb27376a92f61c91567f2bfc2a74dba7192aab
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 19 13:35:28 2013 +0100

css.xml.sax service ctor clean-up

Change-Id: I556904861e93a145cfe65f61218926851e4e8eb0

diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index ccee741..0ad0451 100755
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -457,6 +457,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/xml/dom,\
SAXDocumentBuilder \
 ))
 $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,com/sun/star/xml/sax,\
+   FastParser \
FastShapeContextHandler \
FastTokenHandler \
Parser \
diff --git a/offapi/com/sun/star/xml/sax/FastParser.idl 
b/offapi/com/sun/star/xml/sax/FastParser.idl
new file mode 100644
index 000..4f23822
--- /dev/null
+++ b/offapi/com/sun/star/xml/sax/FastParser.idl
@@ -0,0 +1,23 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_COM_SUN_STAR_XML_SAX_FASTPARSER_IDL
+#define INCLUDED_COM_SUN_STAR_XML_SAX_FASTPARSER_IDL
+
+#include com/sun/star/xml/sax/XFastParser.idl
+
+module com { module sun { module star { module xml { module sax {
+
+service FastParser: XFastParser;
+
+}; }; }; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl 
b/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
index e85334f..0944827 100644
--- a/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
+++ b/offapi/com/sun/star/xml/sax/FastShapeContextHandler.idl
@@ -24,9 +24,7 @@
 
 module com {  module sun {  module star {  module xml {  module sax {
 
-service FastShapeContextHandler : XFastShapeContextHandler
-{
-};
+service FastShapeContextHandler : XFastShapeContextHandler;
 
 }; }; }; }; };
 
diff --git a/oox/source/core/fastparser.cxx b/oox/source/core/fastparser.cxx
index 70e12a8..af79760 100644
--- a/oox/source/core/fastparser.cxx
+++ b/oox/source/core/fastparser.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include sal/config.h
+
+#include com/sun/star/xml/sax/FastParser.hpp
 #include oox/core/fastparser.hxx
 
 #include oox/core/fasttokenhandler.hxx
@@ -72,8 +75,7 @@ FastParser::FastParser( const Reference XComponentContext  
rxContext ) throw(
 mpParser(NULL)
 {
 // create a fast parser instance
-Reference XMultiComponentFactory  xFactory( 
rxContext-getServiceManager(), UNO_SET_THROW );
-mxParser.set( xFactory-createInstanceWithContext( 
com.sun.star.xml.sax.FastParser, rxContext ), UNO_QUERY_THROW );
+mxParser = css::xml::sax::FastParser::create(rxContext);
 mpParser = dynamic_castsax_fastparser::FastSaxParser*(mxParser.get());
 
 // create the fast tokenhandler
diff --git a/oox/source/crypto/DocumentDecryption.cxx 
b/oox/source/crypto/DocumentDecryption.cxx
index 0e90139..6dee4de 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -18,6 +18,7 @@
 #include com/sun/star/uno/XComponentContext.hpp
 #include com/sun/star/xml/sax/XFastParser.hpp
 #include com/sun/star/xml/sax/XFastTokenHandler.hpp
+#include com/sun/star/xml/sax/FastParser.hpp
 #include com/sun/star/xml/sax/FastToken.hpp
 
 namespace oox {
@@ -221,15 +222,11 @@ bool 
DocumentDecryption::readAgileEncryptionInfo(Reference XInputStream  xInp
 mEngine.reset(engine);
 AgileEncryptionInfo info = engine-getInfo();
 
-ReferenceXMultiComponentFactory xFactory( 
mxContext-getServiceManager(), UNO_SET_THROW );
 ReferenceXFastDocumentHandler xFastDocumentHandler( new 
AgileDocumentHandler(info) );
 ReferenceXFastTokenHandlerxFastTokenHandler   ( new 
AgileTokenHandler );
 
-ReferenceXFastParser xParser;
-xParser.set( xFactory-createInstanceWithContext( 
com.sun.star.xml.sax.FastParser, mxContext ), UNO_QUERY_THROW );
-
-if (!xParser.is())
-return false;
+ReferenceXFastParser xParser(
+css::xml::sax::FastParser::create(mxContext));

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

 cui/AllLangResTarget_cui.mk   |1 
 cui/UIConfig_cui.mk   |1 
 cui/source/inc/bbdlg.hxx  |   11 --
 cui/source/inc/cuires.hrc |1 
 cui/source/tabpages/bbdlg.cxx |   34 ++-
 cui/source/tabpages/bbdlg.src |   54 
 cui/uiconfig/ui/borderbackgrounddialog.ui |  133 ++
 7 files changed, 147 insertions(+), 88 deletions(-)

New commits:
commit acee1b8b8c68c5c9d7492dbcc95635e68551713f
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 12:30:43 2013 +

convert border background dialog to .ui

Change-Id: I661384b04fef7f59c2b4feffe093cf75103d55d1

diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 3265c7e..9bf5505 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -59,7 +59,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
 cui/source/options/treeopt.src \
 cui/source/tabpages/align.src \
 cui/source/tabpages/autocdlg.src \
-cui/source/tabpages/bbdlg.src \
 cui/source/tabpages/border.src \
 cui/source/tabpages/dstribut.src \
 cui/source/tabpages/frmdirlbox.src \
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index 1ae0d83..174b243 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -24,6 +24,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/autocorrectdialog \
cui/uiconfig/ui/backgroundpage \
cui/uiconfig/ui/bitmaptabpage \
+   cui/uiconfig/ui/borderbackgrounddialog \
cui/uiconfig/ui/borderpage \
cui/uiconfig/ui/breaknumberoption \
cui/uiconfig/ui/cellalignment \
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index a1bddb3..0b3139a 100644
--- a/cui/source/inc/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
@@ -28,17 +28,14 @@
 class SvxBorderBackgroundDlg: public SfxTabDialog
 {
 public:
-SvxBorderBackgroundDlg( Window *pParent,
-const SfxItemSet rCoreSet,
-sal_Bool bEnableSelector = sal_False );
-
-~SvxBorderBackgroundDlg();
-
+SvxBorderBackgroundDlg(Window *pParent, const SfxItemSet rCoreSet,
+bool bEnableSelector = false);
 protected:
 virtual voidPageCreated( sal_uInt16 nPageId, SfxTabPage rTabPage );
 
 private:
-sal_BoolbEnableBackgroundSelector; /// for Border/Background
+bool m_bEnableBackgroundSelector; /// for Border/Background
+sal_uInt16  m_nBackgroundPageId;
 };
 
 
diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index fc70da2..da21280 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -41,7 +41,6 @@
 
 // used in tabpages
 #define RID_SVXDLG_LINE (RID_SVX_START +  50)
-#define RID_SVXDLG_BBDLG(RID_SVX_START +  40)
 #define RID_SVXDLG_CAPTION  (RID_SVX_START + 151)
 #define RID_SVXSTRARY_PAPERSIZE_STD (RID_SVX_START + 142)
 #define RID_SVXSTRARY_PAPERSIZE_DRAW(RID_SVX_START + 143)
diff --git a/cui/source/tabpages/bbdlg.cxx b/cui/source/tabpages/bbdlg.cxx
index dc99b22..30a487c 100644
--- a/cui/source/tabpages/bbdlg.cxx
+++ b/cui/source/tabpages/bbdlg.cxx
@@ -17,43 +17,27 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include tools/shl.hxx
-#include svx/dialogs.hrc
-#include cuires.hrc
-
 #include bbdlg.hxx
 #include border.hxx
 #include backgrnd.hxx
-#include dialmgr.hxx
-
-// class SvxBorderBackgroundDlg --
-
-SvxBorderBackgroundDlg::SvxBorderBackgroundDlg( Window *pParent,
-const SfxItemSet rCoreSet,
-sal_Bool bEnableSelector ) :
-
-SfxTabDialog( pParent, CUI_RES( RID_SVXDLG_BBDLG ), rCoreSet ),
-bEnableBackgroundSelector( bEnableSelector )
-{
-FreeResource();
-AddTabPage( RID_SVXPAGE_BORDER, SvxBorderTabPage::Create, 0 );
-AddTabPage( RID_SVXPAGE_BACKGROUND, SvxBackgroundTabPage::Create, 0 );
-}
 
-// ---
+SvxBorderBackgroundDlg::SvxBorderBackgroundDlg(Window *pParent,
+const SfxItemSet rCoreSet, bool bEnableSelector)
 
-SvxBorderBackgroundDlg::~SvxBorderBackgroundDlg()
+: SfxTabDialog(pParent, BorderBackgroundDialog,
+cui/ui/borderbackgrounddialog.ui, rCoreSet)
+, m_bEnableBackgroundSelector(bEnableSelector)
+, m_nBackgroundPageId(0)
 {
+AddTabPage(borders, SvxBorderTabPage::Create, 0 );
+m_nBackgroundPageId = AddTabPage(background, 
SvxBackgroundTabPage::Create, 0 );
 }
 
-// ---
-
 void SvxBorderBackgroundDlg::PageCreated( sal_uInt16 nPageId, SfxTabPage 
rTabPage )
 {
 // Make it possible to switch between color/graphic:
-if ( bEnableBackgroundSelector  (RID_SVXPAGE_BACKGROUND == nPageId)

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

 desktop/source/deployment/gui/dp_gui_extlistbox.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit f232b831d439bac53a662c32032c7a0abd430d5e
Author: Stephan Bergmann sberg...@redhat.com
Date:   Mon Dec 16 13:53:30 2013 +0100

m_bHasActive must be false after last visible entry is removed

...otherwise, ExtensionBox_Impl::RecalcAll would crash in 
CalcActiveHeight(-1).

Change-Id: If399825951c79b821ed44ebefa19d1032ab4f850
(cherry picked from commit 661f7bdefc8215f742951727b93395d47293cf0e)
Reviewed-on: https://gerrit.libreoffice.org/7097
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx 
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 19d2749..0d48d55 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -1224,7 +1224,13 @@ void ExtensionBox_Impl::checkEntries()
 if ( nPos  m_nActive )
 m_nActive -= 1;
 else if ( ( nPos == m_nActive )  ( nPos == (long) 
m_vEntries.size() - 1 ) )
+{
 m_nActive -= 1;
+if (m_nActive == -1)
+{
+m_bHasActive = false;
+}
+}
 m_vRemovedEntries.push_back( *iIndex );
 m_vEntries.erase( iIndex );
 iIndex = m_vEntries.begin() + nPos;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - svx/source

 svx/source/unodraw/unoshtxt.cxx |   20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 3ff01bfb98c6aba8095ff9c94b815e895b84ce6f
Author: Michael Stahl mst...@redhat.com
Date:   Mon Dec 16 21:59:25 2013 +0100

SvxTextEditSourceImpl::Notify(): attempt to fix chart2_unoapi crash

Apparently SvxTextEditSourceImpl::mpView is not properly invalidated
when the instance it points to is deleted; the SvxTextEditSourceImpl
is registered as listener so try to handle this in Notify(); not sure
if there isn't something that ought to have cleaned this up...

Crash running with SAL_FORCE_IACCESSIBLE2=1:

svxcorelo.dll!SdrPaintView::FindPaintWindow(const OutputDevice  rOut) Line 
70
svxcorelo.dll!SvxTextEditSourceImpl::GetVisArea() Line 923
svxcorelo.dll!SvxTextEditSource::GetVisArea() Line 1113

svxlo.dll!accessibility::AccessibleTextHelper_Impl::UpdateVisibleChildren(bool 
bBroadcastEvents) Line 868
svxlo.dll!accessibility::AccessibleTextHelper_Impl::ProcessQueue() Line 1376
svxlo.dll!accessibility::AccessibleTextHelper_Impl::Notify(SfxBroadcaster  
__formal, const SfxHint  rHint) Line 1530
svllo.dll!SfxBroadcaster::Broadcast(const SfxHint  rHint) Line 48
svxcorelo.dll!SvxTextEditSourceImpl::NotifyHdl(EENotify * aNotify) Line 1021
svxcorelo.dll!SvxTextEditSourceImpl::LinkStubNotifyHdl(void * pThis, void * 
pCaller) Line 1013
tllo.dll!Link::Call(void * pCaller) Line 123
editenglo.dll!Outliner::ImplBlockInsertionCallbacks(unsigned char b) Line 
2098
editenglo.dll!Outliner::Clear() Line 2036
svxcorelo.dll!SdrOutlinerCache::disposeOutliner(SdrOutliner * pOutliner) 
Line 91
svxcorelo.dll!SdrModel::disposeOutliner(SdrOutliner * pOutliner) Line 1960
svxcorelo.dll!SvxTextEditSourceImpl::dispose() Line 489
svxcorelo.dll!SvxTextEditSourceImpl::Notify(SfxBroadcaster  __formal, 
const SfxHint  rHint) Line 458
svllo.dll!SfxBroadcaster::Broadcast(const SfxHint  rHint) Line 48
svxcorelo.dll!SdrModel::~SdrModel() Line 270
chartcorelo.dll!chart::DrawModelWrapper::~DrawModelWrapper() Line 191
chartcorelo.dll!chart::DrawModelWrapper::`vector deleting 
destructor'(unsigned int)

chartcorelo.dll!boost::checked_deletechart::DrawModelWrapper(chart::DrawModelWrapper
 * x) Line 34

chartcorelo.dll!boost::detail::sp_counted_impl_pchart::DrawModelWrapper::dispose()
 Line 78
chartcorelo.dll!boost::detail::sp_counted_base::release() Line 104
chartcorelo.dll!boost::detail::shared_count::~shared_count() Line 381

chartcorelo.dll!boost::shared_ptrchart::DrawModelWrapper::~shared_ptrchart::DrawModelWrapper()
chartcorelo.dll!boost::shared_ptrchart::DrawModelWrapper::reset() Line 626
chartcorelo.dll!chart::ChartView::~ChartView() Line 202
chartcorelo.dll!chart::ChartView::`scalar deleting destructor'(unsigned int)
cppuhelper3MSC.dll!cppu::OWeakObject::release() Line 204

chartcorelo.dll!cppu::WeakImplHelper10com::sun::star::lang::XInitialization,com::sun::star::lang::XServiceInfo,com::sun::star::datatransfer::XTransferable,com::sun::star::lang::XUnoTunnel,com::sun::star::util::XModifyListener,com::sun::star::util::XModeChangeBroadcaster,com::sun::star::util::XUpdatable,com::sun::star::beans::XPropertySet,com::sun::star::lang::XMultiServiceFactory,com::sun::star::qa::XDumper::release()
 Line 115

chartcorelo.dll!com::sun::star::uno::Referencecom::sun::star::uno::XInterface::~Referencecom::sun::star::uno::XInterface()
 Line 106
chartcorelo.dll!chart::ChartModel::~ChartModel() Line 188
chartcorelo.dll!chart::ChartModel::`vector deleting destructor'(unsigned 
int)
cppuhelper3MSC.dll!cppu::OWeakObject::release() Line 204

Change-Id: Ife6d6275eae74750858a7a7f57153c76a1a228a4
(cherry picked from commit 77378cde59bd9eb986f1ac8b071a5e853bc6805c)
Reviewed-on: https://gerrit.libreoffice.org/7135
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx
index b4b2c62..9181a64 100644
--- a/svx/source/unodraw/unoshtxt.cxx
+++ b/svx/source/unodraw/unoshtxt.cxx
@@ -331,15 +331,31 @@ void SvxTextEditSourceImpl::ChangeModel( SdrModel* 
pNewModel )
 
 //
 
-void SvxTextEditSourceImpl::Notify( SfxBroadcaster, const SfxHint rHint )
+void SvxTextEditSourceImpl::Notify(SfxBroadcaster rBC, const SfxHint rHint)
 {
 // #i105988 keep reference to this object
 rtl::Reference SvxTextEditSourceImpl  xThis( this );
 
 const SdrHint* pSdrHint = PTR_CAST( SdrHint, rHint );
 const SvxViewHint* pViewHint = PTR_CAST( SvxViewHint, rHint );
+const SfxSimpleHint* pSimpleHint = PTR_CAST( SfxSimpleHint, rHint );
 
-if( pViewHint )
+if (pSimpleHint)
+{
+if (SFX_HINT_DYING == pSimpleHint-GetId())
+{
+if (rBC ==

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

2013-12-19 Thread Matteo Casalin

 sw/inc/ndtxt.hxx  |   21 ++---
 sw/source/core/doc/docedt.cxx |4 +---
 sw/source/core/docnode/node.cxx   |7 ---
 sw/source/core/txtnode/ndtxt.cxx  |   14 ++
 sw/source/core/txtnode/txtedt.cxx |8 
 5 files changed, 29 insertions(+), 25 deletions(-)

New commits:
commit 79932eccec436efbff41d5352c58d8ab224b0581
Author: Matteo Casalin matteo.casa...@yahoo.com
Date:   Mon Dec 16 22:30:41 2013 +0100

Do not expose TXTNODE_MAX and cleanup related code/comments

Change-Id: Ia114688ebbdf81122b81183456924c6b9cff835d
Reviewed-on: https://gerrit.libreoffice.org/7105
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: Matteo Casalin matteo.casa...@yahoo.com
Tested-by: Matteo Casalin matteo.casa...@yahoo.com

diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 3268232..ea59828 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -69,10 +69,6 @@ namespace com { namespace sun { namespace star {
 
 typedef std::set sal_Int32  SwSoftPageBreakList;
 
-// do not fill the String up to the max - need to be able to have a
-// SwPosition behind the last character, i.e., at index TXTNODE_MAX + 1
-static const sal_Int32 TXTNODE_MAX = SAL_MAX_INT32 - 2;
-
 /// SwTxtNode is a paragraph in the document model.
 class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
 {
@@ -215,6 +211,9 @@ public:
 
 const OUString GetTxt() const { return m_Text; }
 
+// returns the maximum number of characters that can still be added to the 
node
+inline sal_Int32 GetSpaceLeft() const;
+
 /// getters for SwpHints
 inline   SwpHints GetSwpHints();
 inline const SwpHints GetSwpHints() const;
@@ -239,8 +238,8 @@ public:
 virtual sal_uInt16 ResetAllAttr();
 
 /// insert text content
-/// @param rStr text to insert; in case it does not fit into the limit of
-/// TXTNODE_MAX, the longest prefix that fits is inserted
+/// @param rStr text to insert; in case it does not fit into the capacity
+/// of the node, the longest prefix that fits is inserted
 /// @return the prefix of rStr that was actually inserted
 OUString InsertText( const OUString  rStr, const SwIndex  rIdx,
  const enum IDocumentContentOperations::InsertFlags nMode
@@ -333,7 +332,7 @@ public:
 
 /// replace nDelLen characters at rStart with rText
 /// in case the replacement does not fit, it is partially inserted up to
-/// TXTNODE_MAX
+/// the capacity of the node
 void ReplaceText( const SwIndex rStart, const sal_Int32 nDelLen,
 const OUString  rText );
 void ReplaceTextOnly( sal_Int32 nPos, sal_Int32 nLen,
@@ -855,6 +854,14 @@ SwTxtNode::CutText(SwTxtNode * const pDest, const SwIndex 
 rDestStart,
 CutImpl( pDest, rDestStart, rStart, nLen, true );
 }
 
+inline sal_Int32 SwTxtNode::GetSpaceLeft() const
+{
+// do not fill the String up to the max - need to be able to have a
+// SwPosition behind the last character, i.e., at index TXTNODE_MAX + 1
+const sal_Int32 TXTNODE_MAX = SAL_MAX_INT32 - 2;
+return TXTNODE_MAX-m_Text.getLength();
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 8171500..556f3c8 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -713,9 +713,7 @@ bool SwDoc::Overwrite( const SwPaM rRg, const OUString 
rStr )
 }
 
 SwTxtNode *pNode = rPt.nNode.GetNode().GetTxtNode();
-if (!pNode || ( static_castsize_t(rStr.getLength()) // worst case: no 
erase
-  + static_castsize_t(pNode-GetTxt().getLength())
-   static_castsize_t(TXTNODE_MAX)))
+if (!pNode || rStr.getLength()  pNode-GetSpaceLeft()) // worst case: no 
erase
 {
 return false;
 }
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index acdc7c7..b0519fb 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1646,9 +1646,10 @@ static bool lcl_CheckMaxLength(SwNode const rPrev, 
SwNode const rNext)
 {
 return true;
 }
-size_t const nSum(static_castconst SwTxtNode(rPrev).GetTxt().getLength()
-+ static_castconst 
SwTxtNode(rNext).GetTxt().getLength());
-return (nSum = static_castsize_t(TXTNODE_MAX));
+
+// Check if a node can contain the other (order is not significant)
+return static_castconst SwTxtNode(rPrev).GetSpaceLeft() 
+   static_castconst SwTxtNode(rNext).Len();
 }
 
 /// Can we join two Nodes?
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index f1aea8d..1704fa2 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -1796,10 +1796,9 @@ OUString SwTxtNode::InsertText( const OUString  rStr, 
const SwIndex  rIdx,
 
 const sal_Int32 aPos =

[Libreoffice-commits] core.git: postprocess/Rdb_services.mk winaccessibility/Module_winaccessibility.mk

2013-12-19 Thread Isamu Mogi

 postprocess/Rdb_services.mk |2 +-
 winaccessibility/Module_winaccessibility.mk |2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 1542a655ea21da4cdcd4b836283e44fba5f35059
Author: Isamu Mogi saturda...@gmail.com
Date:   Wed Dec 18 20:52:45 2013 +0900

--disable-atl disables winaccessibility

Change-Id: I548ea294e6c632b8ae95e6745a51d9b12c7e5297
Reviewed-on: https://gerrit.libreoffice.org/7130
Reviewed-by: Michael Stahl mst...@redhat.com
Tested-by: Michael Stahl mst...@redhat.com

diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index a49b1dd..7e9568b 100755
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -135,7 +135,6 @@ $(eval $(call gb_Rdb_add_components,services,\
shell/source/win32/simplemail/smplmail \
shell/source/win32/syssh \
vcl/vcl.windows \
-   winaccessibility/source/service/winaccessibility \
) \
$(if $(ENABLE_HEADLESS), \
vcl/vcl.headless \
@@ -148,6 +147,7 @@ $(eval $(call gb_Rdb_add_components,services,\
embeddedobj/source/msole/emboleobj.windows \
embedserv/util/emser \
extensions/source/ole/oleautobridge \
+   winaccessibility/source/service/winaccessibility \
) \
) \
$(if $(DISABLE_NEON),, \
diff --git a/winaccessibility/Module_winaccessibility.mk 
b/winaccessibility/Module_winaccessibility.mk
index 2421164..19490a6 100644
--- a/winaccessibility/Module_winaccessibility.mk
+++ b/winaccessibility/Module_winaccessibility.mk
@@ -11,12 +11,14 @@ $(eval $(call gb_Module_Module,winaccessibility))
 
 ifeq ($(OS),WNT)
 ifeq ($(COM),MSC)
+ifeq ($(DISABLE_ATL),)
 $(eval $(call gb_Module_add_targets,winaccessibility,\
WinResTarget_uacccom \
CustomTarget_ia2_idl \
Library_uacccom \
Library_winaccessibility \
 ))
+endif # !DISABLE_ATL
 endif # COM=MSC
 endif # WNT
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-12-19 Thread Khaled Hosny

 vcl/README |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 6c5c79e2032ecc980e6774656a67ca67ce45b108
Author: Khaled Hosny khaledho...@eglug.org
Date:   Thu Dec 19 15:25:40 2013 +0200

Public headers are long moved from here

Change-Id: I672f0348167a6347a609ad9f56b99ed056f7b4b1

diff --git a/vcl/README b/vcl/README
index 5d3a760..72f02e0 100644
--- a/vcl/README
+++ b/vcl/README
@@ -7,8 +7,6 @@ source/
 
 inc/
+ cross-platform abstraction headers
-   vcl/
-   + public headers (public to the rest of LibreOffice, that is)
 
 generic/
+ shared helper code for *some* of the backends, actually built into 
vcl.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/AllLangResTarget_chartcontroller.mk chart2/source chart2/uiconfig chart2/UIConfig_chart2.mk

2013-12-19 Thread Olivier Hallot

 chart2/AllLangResTarget_chartcontroller.mk   |1 
 chart2/UIConfig_chart2.mk|1 
 chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx |2 
 chart2/source/controller/dialogs/res_DataLabel.cxx   |  310 +
 chart2/source/controller/dialogs/res_DataLabel.hxx   |   65 +-
 chart2/source/controller/dialogs/tp_DataLabel.cxx|   11 
 chart2/source/controller/dialogs/tp_DataLabel.src|   32 
 chart2/source/controller/inc/HelpIds.hrc |2 
 chart2/source/controller/inc/dlg_InsertDataLabel.hxx |4 
 chart2/uiconfig/ui/tp_DataLabel.ui   |  482 +++
 10 files changed, 851 insertions(+), 59 deletions(-)

New commits:
commit 9dccff429db197a92ed2af957fb6d3d75b3f2154
Author: Olivier Hallot olivier.hal...@edx.srv.br
Date:   Wed Dec 18 00:45:32 2013 -0200

Convert chart data labels tabpage to .ui

Change-Id: I6ffd992fe8a2cb290c8f8992922f0e54276e6ae1
Reviewed-on: https://gerrit.libreoffice.org/7124
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/chart2/AllLangResTarget_chartcontroller.mk 
b/chart2/AllLangResTarget_chartcontroller.mk
index 9342cc7..3c6d55b 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
 chart2/source/controller/dialogs/Strings_Statistic.src \
 chart2/source/controller/dialogs/tp_AxisLabel.src \
 chart2/source/controller/dialogs/tp_ChartType.src \
-chart2/source/controller/dialogs/tp_DataLabel.src \
 chart2/source/controller/dialogs/tp_DataSource.src \
 chart2/source/controller/dialogs/tp_ErrorBars.src \
 chart2/source/controller/dialogs/tp_PointGeometry.src \
diff --git a/chart2/UIConfig_chart2.mk b/chart2/UIConfig_chart2.mk
index 41a5fa9..9f5f044 100644
--- a/chart2/UIConfig_chart2.mk
+++ b/chart2/UIConfig_chart2.mk
@@ -43,6 +43,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/schart,\
chart2/uiconfig/ui/tp_3D_SceneIllumination \
chart2/uiconfig/ui/tp_axisLabel \
chart2/uiconfig/ui/tp_AxisPositions \
+   chart2/uiconfig/ui/tp_DataLabel \
chart2/uiconfig/ui/tp_LegendPosition \
chart2/uiconfig/ui/tp_SeriesToAxis \
chart2/uiconfig/ui/tp_Scale \
diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx 
b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
index 9a16638..4047644 100644
--- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
@@ -31,7 +31,7 @@ DataLabelsDialog::DataLabelsDialog(Window* pWindow, const 
SfxItemSet rInAttrs,
 m_aBtnOK(this, SchResId(BTN_OK)),
 m_aBtnCancel(this, SchResId(BTN_CANCEL)),
 m_aBtnHelp(this, SchResId(BTN_HELP)),
-m_apDataLabelResources( new DataLabelResources(this,rInAttrs) ),
+m_apDataLabelResources( new oldDataLabelResources(this,rInAttrs) ),
 m_rInAttrs(rInAttrs)
 {
 FreeResource();
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx 
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index b69a9e3..c0caf79 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -94,7 +94,289 @@ void lcl_setBoolItemToCheckBox( const SfxItemSet rInAttrs, 
sal_uInt16 nWhichId,
 
 }//end anonymous namespace
 
-DataLabelResources::DataLabelResources( Window* pWindow, const SfxItemSet 
rInAttrs )
+DataLabelResources::DataLabelResources(SfxTabPage* pWindow, const SfxItemSet 
rInAttrs )
+:
+m_pNumberFormatter(0),
+m_bNumberFormatMixedState(true),
+m_bPercentFormatMixedState(true),
+m_nNumberFormatForValue(0),
+m_nNumberFormatForPercent(11),
+m_bSourceFormatMixedState(true),
+m_bPercentSourceMixedState(true),
+m_bSourceFormatForValue(true),
+m_bSourceFormatForPercent(true),
+m_pWindow(pWindow),
+m_pPool(rInAttrs.GetPool())
+{
+pWindow-get(m_pCBNumber, CB_VALUE_AS_NUMBER);
+pWindow-get(m_pPB_NumberFormatForValue, PB_NUMBERFORMAT);
+pWindow-get(m_pCBPercent, CB_VALUE_AS_PERCENTAGE);
+pWindow-get(m_pPB_NumberFormatForPercent, PB_PERCENT_NUMBERFORMAT);
+pWindow-get(m_pCBCategory, CB_CATEGORY);
+pWindow-get(m_pCBSymbol, CB_SYMBOL);
+
+pWindow-get(m_pBxLabelPlacement, boxPLACEMENT);
+pWindow-get(m_pLB_LabelPlacement, LB_LABEL_PLACEMENT);
+
+pWindow-get(m_pDC_Dial, CT_DIAL);
+pWindow-get(m_pFT_Dial, CT_LABEL_DIAL);
+
+m_pDC_Dial-SetText(m_pFT_Dial-GetText());
+
+pWindow-get(m_pNF_Degrees, NF_LABEL_DEGREES);
+pWindow-get(m_pLB_TextDirection, LB_LABEL_TEXTDIR);
+pWindow-get(m_pBxTextDirection, boxTXT_DIRECTION);
+pWindow-get(m_pBxOrientation, boxORIENTATION);
+
+pWindow-get(m_pSeparatorResources, boxSEPARATOR);
+pWindow-get(m_pLB_Separator, LB_TEXT_SEPARATOR);
+
+

[Libreoffice-commits] core.git: 2 commits - codemaker/source configure.ac include/osl

2013-12-19 Thread Douglas Mencken

 codemaker/source/cppumaker/cpputype.cxx |   31 --
 configure.ac|   12 +---
 include/osl/detail/component-defines.h  |   44 
 3 files changed, 79 insertions(+), 8 deletions(-)

New commits:
commit d70f5d1e5477f3fce6cf35884b3cecb260d504e1
Author: Douglas Mencken dougmenc...@gmail.com
Date:   Wed Dec 18 13:40:46 2013 -0500

Don't enable OpenCL on OS X 10.5

Change-Id: I5b74d9a043c793ff5176b10786c09041207509a6
Reviewed-on: https://gerrit.libreoffice.org/7138
Reviewed-by: Norbert Thiebaud nthieb...@gmail.com
Tested-by: Norbert Thiebaud nthieb...@gmail.com

diff --git a/configure.ac b/configure.ac
index 534894a..1734796 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10448,13 +10448,15 @@ AC_MSG_CHECKING([whether to build with the OpenCL 
support.])
 ENABLE_OPENCL=
 
 if test $_os != iOS -a $_os != Android -a x$enable_opencl != xno; then
-AC_MSG_RESULT([yes])
-enable_opencl=yes
-ENABLE_OPENCL=TRUE
-AC_DEFINE(HAVE_FEATURE_OPENCL)
+if test $_os = Darwin -a $with_macosx_sdk = 10.5; then
+AC_MSG_RESULT([disabled on OS X 10.5])
+else
+AC_MSG_RESULT([yes])
+ENABLE_OPENCL=YES
+AC_DEFINE(HAVE_FEATURE_OPENCL)
+fi
 else
 AC_MSG_RESULT([no])
-enable_opencl=no
 fi
 
 AC_SUBST(ENABLE_OPENCL)
commit 15abebbde560e17413f17b16b8b2e9c1f31f01a5
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 19 14:42:10 2013 +0100

WIP: Direct service ctor calls at least on Android/iOS

Change-Id: I8a1907bc4b8f2134efb15d38a0fb5176b4384317

diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codemaker/source/cppumaker/cpputype.cxx
index 0a710a8..dc5874c 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -3408,6 +3408,17 @@ void ServiceType::dumpHxxFile(
 OUString headerDefine(dumpHeaderDefine(o, HPP));
 o  \n;
 includes.dump(o, 0);
+if (!entity_-getConstructors().empty()) {
+o  (\n#if defined ANDROID || defined IOS //TODO\n
+  #include osl/detail/component-defines.h\n#endif\n\n
+  #if defined LO_URE_CURRENT_ENV  defined LO_URE_CTOR_ENV_)
+   name_.replaceAll(., _dot_)
+ (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_
+   name_.replaceAll(., _dot_)  )  defined LO_URE_CTOR_FUN_
+   name_.replaceAll(., _dot_)
+   \nextern \C\ void * SAL_CALL LO_URE_CTOR_FUN_
+   name_.replaceAll(., _dot_)  (void *, void *);\n#endif\n;
+}
 o  \n;
 if (codemaker::cppumaker::dumpNamespaceOpen(o, name_, false)) {
 o  \n;
@@ -3436,14 +3447,28 @@ void ServiceType::dumpHxxFile(
::css::uno::Reference   scopedBaseName
  the_instance;\n  indent()  try {\n;
 inc();
-o  indent()
-   the_instance = ::css::uno::Reference 
+o  (#if defined LO_URE_CURRENT_ENV  defined 
+  LO_URE_CTOR_ENV_)
+   name_.replaceAll(., _dot_)
+ (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_
+   name_.replaceAll(., _dot_)
+   )  defined LO_URE_CTOR_FUN_
+   name_.replaceAll(., _dot_)  \n  indent()
+   the_instance = ::css::uno::Reference   scopedBaseName
+   ( (::css::uno::Reference ::css::uno::XInterface (
+  static_cast ::css::uno::XInterface * ((*
+  LO_URE_CTOR_FUN_)
+   name_.replaceAll(., _dot_)
+   ()(the_context.get(), ::css::uno::Sequence
+   ::css::uno::Any ().get())), ::SAL_NO_ACQUIRE),
+   ::css::uno::UNO_QUERY);\n#else\n)
+   indent()  the_instance = ::css::uno::Reference 
scopedBaseName
( (the_context-getServiceManager()-
   createInstanceWithContext(::rtl::OUString(
\)
name_
-   \ ), the_context), ::css::uno::UNO_QUERY);\n;
+   \ ), the_context), ::css::uno::UNO_QUERY);\n#endif\n;
 dec();
 o  indent()
} catch (const ::css::uno::RuntimeException ) {\n;
diff --git a/include/osl/detail/component-defines.h 
b/include/osl/detail/component-defines.h
new file mode 100644
index 000..63893ea
--- /dev/null
+++ b/include/osl/detail/component-defines.h
@@ -0,0 +1,44 @@
+/* -*- 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/.
+ */
+
+#ifndef INCLUDED_OSL_DETAIL_COMPONENT_DEFINES_H
+#define

[Libreoffice-commits] core.git: 3 commits - chart2/source chart2/uiconfig helpcontent2

 chart2/source/controller/inc/HelpIds.hrc |1 -
 chart2/uiconfig/ui/tp_DataLabel.ui   |4 
 helpcontent2 |2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit a005a172f88bf51fc5a66fc2a52c797b536a62be
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 13:43:30 2013 +

drop unused helpids

Change-Id: Icfb82a7e76a03060c7a1a333ebc1e233b0047138

diff --git a/chart2/source/controller/inc/HelpIds.hrc 
b/chart2/source/controller/inc/HelpIds.hrc
index 10e2753..7b4e6da 100644
--- a/chart2/source/controller/inc/HelpIds.hrc
+++ b/chart2/source/controller/inc/HelpIds.hrc
@@ -67,7 +67,6 @@
 #define HID_SCH_STATISTIK_MINUS_VALUE   
CHART2_HID_SCH_STATISTIK_MINUS_VALUE
 
 #define HID_SCH_DATALABEL_VALUE 
CHART2_HID_SCH_DATALABEL_VALUE
-#define HID_SCH_DATALABEL_NUMBER
CHART2_HID_SCH_DATALABEL_NUMBER
 #define HID_SCH_DATALABEL_PERCENT   
CHART2_HID_SCH_DATALABEL_PERCENT
 #define HID_SCH_DATALABEL_TEXT  
CHART2_HID_SCH_DATALABEL_TEXT
 #define HID_SCH_DATALABEL_SYMBOL
CHART2_HID_SCH_DATALABEL_SYMBOL
commit 805380291c5596064a8db5515ab6d17f7be66d73
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 13:31:18 2013 +

vertically center some stuff

Change-Id: I37107933bdf1a3f2b430981a92857be25e1429b3

diff --git a/chart2/uiconfig/ui/tp_DataLabel.ui 
b/chart2/uiconfig/ui/tp_DataLabel.ui
index 2ce94ac..e8395f0 100644
--- a/chart2/uiconfig/ui/tp_DataLabel.ui
+++ b/chart2/uiconfig/ui/tp_DataLabel.ui
@@ -194,6 +194,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=receives_defaultTrue/property
+property name=valigncenter/property
 property name=use_underlineTrue/property
   /object
   packing
@@ -209,6 +210,7 @@
 property name=visibleTrue/property
 property name=can_focusFalse/property
 property name=receives_defaultTrue/property
+property name=valigncenter/property
 property name=use_underlineTrue/property
   /object
   packing
@@ -258,6 +260,7 @@
   object class=GtkComboBox id=LB_TEXT_SEPARATOR
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=valigncenter/property
 property name=modelliststoreSEPARATOR/property
   /object
   packing
@@ -298,6 +301,7 @@
   object class=GtkComboBox id=LB_LABEL_PLACEMENT
 property name=visibleTrue/property
 property name=can_focusFalse/property
+property name=valigncenter/property
 property name=modelliststorePLACEMENT/property
   /object
   packing
commit c546d8429455b8b1b241983c4edacad7a42a1255
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 13:43:11 2013 +

Updated core
Project: help  60772893d33ffe9ff5d9ae2e1ec8d437781ab1d1

diff --git a/helpcontent2 b/helpcontent2
index 0b0b8d6..60772893 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 0b0b8d6fbe77b6938b8e378217c3ca8b8588ee51
+Subproject commit 60772893d33ffe9ff5d9ae2e1ec8d437781ab1d1
___
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

 helpers/help_hid.lst   |1 
 source/text/schart/01/0403.xhp |   38 +++--
 2 files changed, 20 insertions(+), 19 deletions(-)

New commits:
commit 60772893d33ffe9ff5d9ae2e1ec8d437781ab1d1
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 13:43:11 2013 +

update help ids for data label tabpage .ui conversion

Change-Id: If03848a87b7a7fedf25afa6ee4b6d4c86335ef1c

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index b11241b..589b1f3 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3022,7 +3022,6 @@ HID_SCH_DATALABEL_SEPARATOR,63370,
 HID_SCH_DATALABEL_SYMBOL,63359,
 HID_SCH_DATALABEL_TEXT,63358,
 HID_SCH_DATALABEL_VALUE,63355,
-HID_SCH_DATA_DESCR,63286,
 HID_SCH_DATA_RANGES_LIST,63296,
 HID_SCH_DATA_SERIES_LABEL,63367,
 HID_SCH_DLG_RANGES,63327,
diff --git a/source/text/schart/01/0403.xhp 
b/source/text/schart/01/0403.xhp
index 2a09504..8e8f4c4 100644
--- a/source/text/schart/01/0403.xhp
+++ b/source/text/schart/01/0403.xhp
@@ -34,6 +34,7 @@
   bookmark_valuechart legends; showing icons with labels/bookmark_value
 /bookmark
 bookmark xml-lang=en-US branch=hid/.uno:InsertMenuDataLabels 
id=bm_id3144510 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_DataLabel/tp_DataLabel id=bm_id3144511 
localize=false/
 section id=datalabels
  paragraph xml-lang=en-US id=hd_id3150275 role=heading 
level=1 l10n=U oldref=1variable id=datenbeschriftunglink 
href=text/schart/01/0403.xhp name=Data labelsData Labels/link
 /variable/paragraph
@@ -46,50 +47,51 @@
   section id=howtoget
  embed href=text/schart/00/0004.xhp#efgdbs/
   /section
-!-- removed HID SCH_RADIOBUTTON_TP_DATA_DESCR_RB_NUMBER --
-!-- removed HID SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_NUMBER --
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_DATALABEL_NUMBER 
id=bm_id901516 localize=false/
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_DataLabel/CB_VALUE_AS_NUMBER id=bm_id901517 
localize=false/
 bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_DATALABEL_VALUE 
id=bm_id8825342 localize=false/
 paragraph xml-lang=en-US id=hd_id3149401 role=heading level=2 
l10n=CHG
  oldref=17Show value as number/paragraph
-  paragraph xml-lang=en-US id=par_id3150751 role=paragraph l10n=U 
oldref=18ahelp hid=SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_NUMBERDisplays the 
absolute values of the data points./ahelp/paragraph
-bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_PB_NUMBERFORMAT 
id=bm_id1717276 localize=false/
+  paragraph xml-lang=en-US id=par_id3150751 role=paragraph l10n=U 
oldref=18ahelp 
hid=modules/schart/ui/tp_DataLabel/CB_VALUE_AS_NUMBERDisplays the absolute 
values of the data points./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_DataLabel/PB_NUMBERFORMAT id=bm_id1717276 
localize=false/
+bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_PB_NUMBERFORMAT 
id=bm_id1717277 localize=false/
 paragraph xml-lang=en-US id=hd_id5077059 role=heading level=2 
l10n=NEWNumber format/paragraph
   paragraph xml-lang=en-US id=par_id9794610 role=paragraph 
l10n=NEWahelp hid=.Opens a dialog to select the number 
format./ahelp/paragraph
-!-- removed HID SCH_RADIOBUTTON_TP_DATA_DESCR_RB_PERCENT --
-!-- removed HID SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_PERCENT --
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_DataLabel/CB_VALUE_AS_PERCENTAGE 
id=bm_id9111912 localize=false/
 bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_DATALABEL_PERCENT 
id=bm_id9111911 localize=false/
 paragraph xml-lang=en-US id=hd_id3145643 role=heading level=2 
l10n=CHG
  oldref=9Show value as percentage/paragraph
-  paragraph xml-lang=en-US id=par_id3156382 role=paragraph l10n=U 
oldref=10ahelp hid=SCH_RADIOBUTTON_DLG_DATA_DESCR_RB_PERCENTDisplays the 
percentage of the data points in each column./ahelp/paragraph
+  paragraph xml-lang=en-US id=par_id3156382 role=paragraph l10n=U 
oldref=10ahelp 
hid=modules/schart/ui/tp_DataLabel/CB_VALUE_AS_PERCENTAGEDisplays the 
percentage of the data points in each column./ahelp/paragraph
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_DataLabel/PB_PERCENT_NUMBERFORMAT 
id=bm_id381482 localize=false/
 bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_PB_PERCENT_NUMBERFORMAT 
id=bm_id381481 localize=false/
 paragraph xml-lang=en-US id=hd_id1316873 role=heading level=2 
l10n=NEWPercentage format/paragraph
   paragraph xml-lang=en-US id=par_id5476241 role=paragraph 
l10n=NEWahelp hid=.Opens a dialog to select the percentage 
format./ahelp/paragraph
-!-- removed HID SCH_CHECKBOX_DLG_DATA_DESCR_CB_TEXT --
-!-- removed HID SCH_CHECKBOX_TP_DATA_DESCR_CB_TEXT --
+bookmark xml-lang=en-US 
branch=hid/modules/schart/ui/tp_DataLabel/CB_CATEGORY id=bm_id3015534 
localize=false/
 bookmark xml-lang=en-US branch=hid/CHART2_HID_SCH_DATALABEL_TEXT 
id=bm_id3015533 localize=false/
 paragraph xml-lang=en-US

Re: Efficient UNO component linkage GC ...


On 12/19/2013 10:51 AM, Stephan Bergmann wrote:

* next step is to let certain occurrences of UNO service constructor
(and singleton getter) calls in C++ code call corresponding constructor
functions directly (instead of going via service manager's
createInstanceWith[ArgumentsAnd]Context); conditions under which this
simplification can be done:

** caller and implementation use the same environment (e.g., both gcc3;
this is not the case e.g. for
connectivity/source/drivers/jdbc/jdbc.component's
environment=@CPPU_ENV@:affine)

** and caller knows that the constructor function is visible (i.e., the
library/executable supplying it is loaded)

** note that there are always situations where UNO services are not
called via constructor, though; e.g., the constructor-less
css.uri.UriSchemeParser_* services are always created via dynamically
computed name

* idea is to set aside for every UNO service/singleton S two macros
LO_URE_CTOR_ENV_S' and LO_URE_CTOR_FUN_S', and a macro
LO_URE_CURRENT_ENV, and modify cppumaker to generate constructor code as

[...]

i.e., 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=15abebbde560e17413f17b16b8b2e9c1f31f01a5 
WIP: Direct service ctor calls at least on Android/iOS


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

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

2013-12-19 Thread Jan Holesovsky

 include/vcl/outdev.hxx   |1 +
 vcl/source/gdi/outdev.cxx|1 +
 vcl/source/gdi/outdev3.cxx   |7 ---
 vcl/source/gdi/virdev.cxx|2 ++
 vcl/source/window/window.cxx |5 +
 5 files changed, 13 insertions(+), 3 deletions(-)

New commits:
commit 6b5cac1ca06a052061d2fe6acff1bc1e3cb45d57
Author: Jan Holesovsky ke...@collabora.com
Date:   Thu Dec 19 14:47:50 2013 +0100

Introduce DPI scale factor for Hi-DPI displays.

This is supposed to stay 1 (no scale) for printers and default virtual
devices, but should be set accordingly (2 or 3) for windows and virtual
devices derived from windows.

Various VCL widgets or paint operations should incrementally become aware of
this, and changed so that they draw nicely on the Hi-DPI displays.  This 
patch
only introduces the behavior for waved lines.

The default is currently being set depending on the DPI setting only; could 
be
changed to a more clever way if necessary.

Change-Id: I71118f9ab6b64028d176e860e999d5cd9d19

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index b0d5089..78f768e 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -310,6 +310,7 @@ private:
 longmnOutHeight;
 sal_Int32   mnDPIX;
 sal_Int32   mnDPIY;
+sal_Int32   mnDPIScaleFactor; /// For Hi-DPI displays, we want to 
draw everything mnDPIScaleFactor-times larger
 /// font specific text alignment offsets in pixel units
 mutable longmnTextOffX;
 mutable longmnTextOffY;
diff --git a/vcl/source/gdi/outdev.cxx b/vcl/source/gdi/outdev.cxx
index b6f8945..8009275 100644
--- a/vcl/source/gdi/outdev.cxx
+++ b/vcl/source/gdi/outdev.cxx
@@ -344,6 +344,7 @@ OutputDevice::OutputDevice() :
 mnOutHeight = 0;
 mnDPIX  = 0;
 mnDPIY  = 0;
+mnDPIScaleFactor= 1;
 mnTextOffX  = 0;
 mnTextOffY  = 0;
 mnOutOffOrigX   = 0;
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index 36c72030..850f63a 100644
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -5319,9 +5319,10 @@ void OutputDevice::DrawWaveLine( const Point rStartPos, 
const Point rEndPos,
  if( nWaveHeight  pFontEntry-maMetric.mnWUnderlineSize )
  nWaveHeight = pFontEntry-maMetric.mnWUnderlineSize;
 
- ImplDrawWaveLine( nStartX, nStartY, 0, 0,
-  nEndX-nStartX, nWaveHeight, 1,
-  nOrientation, GetLineColor() );
+ImplDrawWaveLine(nStartX, nStartY, 0, 0,
+nEndX-nStartX, nWaveHeight * mnDPIScaleFactor,
+mnDPIScaleFactor, nOrientation, GetLineColor());
+
 if( mpAlphaVDev )
 mpAlphaVDev-DrawWaveLine( rStartPos, rEndPos, nStyle );
 }
diff --git a/vcl/source/gdi/virdev.cxx b/vcl/source/gdi/virdev.cxx
index 54d40f3..4ef4720 100644
--- a/vcl/source/gdi/virdev.cxx
+++ b/vcl/source/gdi/virdev.cxx
@@ -97,6 +97,7 @@ void VirtualDevice::ImplInitVirDev( const OutputDevice* 
pOutDev,
 mpFontCache = pSVData-maGDIData.mpScreenFontCache;
 mnDPIX  = pOutDev-mnDPIX;
 mnDPIY  = pOutDev-mnDPIY;
+mnDPIScaleFactor = pOutDev-mnDPIScaleFactor;
 maFont  = pOutDev-maFont;
 
 if( maTextColor != pOutDev-maTextColor )
@@ -406,6 +407,7 @@ void VirtualDevice::ImplSetReferenceDevice( RefDevMode 
i_eRefDevMode, sal_Int32
 {
 mnDPIX = i_nDPIX;
 mnDPIY = i_nDPIY;
+mnDPIScaleFactor = 1;
 
 EnableOutput( sal_False );  // prevent output on reference device
 mbScreenComp = sal_False;
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 78995af..e689668 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1711,12 +1711,17 @@ void Window::ImplInitResolutionSettings()
 sal_uInt16 nScreenZoom = rStyleSettings.GetScreenZoom();
 mnDPIX = (mpWindowImpl-mpFrameData-mnDPIX*nScreenZoom)/100;
 mnDPIY = (mpWindowImpl-mpFrameData-mnDPIY*nScreenZoom)/100;
+
+// setup the scale factor for Hi-DPI displays
+mnDPIScaleFactor = std::max(1, (mpWindowImpl-mpFrameData-mnDPIY + 
48) / 96);
+
 SetPointFont( rStyleSettings.GetAppFont() );
 }
 else if ( mpWindowImpl-mpParent )
 {
 mnDPIX  = mpWindowImpl-mpParent-mnDPIX;
 mnDPIY  = mpWindowImpl-mpParent-mnDPIY;
+mnDPIScaleFactor = mpWindowImpl-mpParent-mnDPIScaleFactor;
 }
 
 // update the recalculated values for logical units
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-12-19 Thread Adam Co

 sw/source/filter/ww8/attributeoutputbase.hxx |2 +-
 sw/source/filter/ww8/wrtw8nds.cxx|2 +-
 sw/source/filter/ww8/ww8atr.cxx  |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 7590adfa18c671193f2e5497545f2f4cd62039bc
Author: Adam Co rattles2...@gmail.com
Date:   Wed Dec 18 11:46:53 2013 +0200

Renaming function from 'IsFoo' to 'GetFoo'

Change-Id: If4b4de730a5bc1825ddd1430fe68a31eb423bf50
Reviewed-on: https://gerrit.libreoffice.org/7127
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/source/filter/ww8/attributeoutputbase.hxx 
b/sw/source/filter/ww8/attributeoutputbase.hxx
index 73ec4fb..06ef068 100644
--- a/sw/source/filter/ww8/attributeoutputbase.hxx
+++ b/sw/source/filter/ww8/attributeoutputbase.hxx
@@ -636,7 +636,7 @@ public:
 virtual void BulletDefinition(int /*nId*/, const Graphic /*rGraphic*/, 
Size /*aSize*/) {}
 
 // Returns whether or not the 'SwTxtNode' has a paragraph marker deleted 
(using 'track changes')
-virtual const SwRedlineData* IsParagraphMarkerDeleted( const SwTxtNode 
rNode );
+virtual const SwRedlineData* GetDeletedParagraphMarker( const SwTxtNode 
rNode );
 
 };
 
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index 718d9c0..a8bd186 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2427,7 +2427,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode 
rNode )
 }
 }
 
-const SwRedlineData* pRedlineParagraphMarkerDeleted = 
AttrOutput().IsParagraphMarkerDeleted( rNode );
+const SwRedlineData* pRedlineParagraphMarkerDeleted = 
AttrOutput().GetDeletedParagraphMarker( rNode );
 const SwRedlineData* pParagraphRedlineData = 
aAttrIter.GetParagraphLevelRedline( );
 AttrOutput().EndParagraphProperties( pParagraphRedlineData, 
pRedlineParagraphMarkerDeleted );
 
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 5561866..c2f3d58 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -5389,7 +5389,7 @@ void AttributeOutputBase::FormatCharBorder( const 
SvxBoxItem rBox )
  * - Start = the last character of the current paragraph
  * - End = the first character of the next paragraph
  */
-const SwRedlineData* AttributeOutputBase::IsParagraphMarkerDeleted( const 
SwTxtNode rNode )
+const SwRedlineData* AttributeOutputBase::GetDeletedParagraphMarker( const 
SwTxtNode rNode )
 {
 // ToDo : this is not the most ideal ... should start maybe from 
'nCurRedlinePos'
 for( sal_uInt16 nRedlinePos = 0; nRedlinePos  
GetExport().pDoc-GetRedlineTbl().size(); ++nRedlinePos )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-12-19 Thread Nikhil Walvekar

 sw/source/filter/ww8/ww8atr.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 828113d2293638e33ffe9e2737e09d2cd6c3b0e9
Author: Nikhil Walvekar nikhil.walve...@synerzip.com
Date:   Mon Dec 16 12:22:02 2013 +0530

FILESAVE: DOCX. Added null check to avoid crash.

Change-Id: I6f61d69702f77f0291ad25f5c39974d263d273e8
Reviewed-on: https://gerrit.libreoffice.org/7096
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index c2f3d58..0c407ee 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -2229,11 +2229,14 @@ void AttributeOutputBase::StartTOX( const SwSection 
rSect )
 if( !sStyle.isEmpty() )
 {
 SwTxtFmtColl* pColl = 
GetExport().pDoc-FindTxtFmtCollByName(sStyle);
-if 
(!pColl-IsAssignedToListLevelOfOutlineStyle() || 
pColl-GetAssignedOutlineStyleLevel()  nTOXLvl)
+if (pColl)
 {
-if( !sTOption.isEmpty() )
-sTOption += ,;
-sTOption += sStyle + sLvl;
+if 
(!pColl-IsAssignedToListLevelOfOutlineStyle() || 
pColl-GetAssignedOutlineStyleLevel()  nTOXLvl)
+{
+if( !sTOption.isEmpty() )
+sTOption += ,;
+sTOption += sStyle + sLvl;
+}
 }
 }
 } while( -1 != nPos );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-12-19 Thread Lionel Elie Mamane

 dbaccess/source/core/api/RowSet.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 69e264131334134bef9a7069df959ba1ce1406e7
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Mon Dec 16 05:50:34 2013 +0100

Revert fdo#72163 after updating m_xComposer, command facets are not dirty

This reverts commit 938f0e7fe4216d135815b98fdb918f97e747c6bd.

This caused too many bugs to be cleaned up this late in the 4.2
development cycle:
 - unittest failure; fixed only for the unittested driver.
   (commit 917f9576349240796dfc0cef0f38c9b861c316e7
Issue of RowSet and Statement each thinking they own
the ResultSet, and both calling dispose on it...
After this revert, will not happen because RowSet
will never generate two ResultSets from the same Statement.)
   Still needs fixing for all other drivers... Not realistic
   in timeframe for 4.2.0.
 - fdo#72696
 - fdo#72463

The following commit still keeps fdo#72163 fixed.

commit 5bfdb6cd5f80f87c5bc6b0bccdad5aad00a45ba3
   fdo#72163 belts and suspenders

Change-Id: Ieb8c8cf1ce9b681b644f34b74a2c6929b3bc300b
Reviewed-on: https://gerrit.libreoffice.org/7093
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/dbaccess/source/core/api/RowSet.cxx 
b/dbaccess/source/core/api/RowSet.cxx
index f2c4345..0429c5e 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -2292,8 +2292,6 @@ sal_Bool ORowSet::impl_initComposer_throw( OUString 
_out_rCommandToExecute )
 
 _out_rCommandToExecute = m_xComposer-getQueryWithSubstitution();
 
-m_bCommandFacetsDirty = sal_False;
-
 return bUseEscapeProcessing;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - connectivity/source

2013-12-19 Thread Lionel Elie Mamane

 connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx |   18 
+-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 2b77788dab88ac0960537b76c42e4f30e68c5a6e
Author: Lionel Elie Mamane lio...@mamane.lu
Date:   Sat Dec 14 06:00:18 2013 +0100

odbc DBMetaData: NULL pattern equivalent to %, not %foo

Change-Id: Ief475a1bf6e65b4786e8ee9c025b204f143a30e0
Reviewed-on: https://gerrit.libreoffice.org/7079
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git 
a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx 
b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index 2e772fc..7ba4935 100644
--- a/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -854,7 +854,7 @@ void ODatabaseMetaDataResultSet::openTables(const Any 
catalog, const OUString
 OString aPKQ,aPKO,aPKN,aCOL;
 const OUString *pSchemaPat = NULL;
 
-if(schemaPattern.toChar() != '%')
+if(schemaPattern != %)
 pSchemaPat = schemaPattern;
 else
 pSchemaPat = NULL;
@@ -951,7 +951,7 @@ void ODatabaseMetaDataResultSet::openColumnPrivileges(  
const Any catalog, cons
 {
 const OUString *pSchemaPat = NULL;
 
-if(schema.toChar() != '%')
+if(schema != %)
 pSchemaPat = schema;
 else
 pSchemaPat = NULL;
@@ -986,7 +986,7 @@ void ODatabaseMetaDataResultSet::openColumns(   const Any 
catalog,
 {
 const OUString *pSchemaPat = NULL;
 
-if(schemaPattern.toChar() != '%')
+if(schemaPattern != %)
 pSchemaPat = schemaPattern;
 else
 pSchemaPat = NULL;
@@ -1054,7 +1054,7 @@ void ODatabaseMetaDataResultSet::openProcedureColumns(  
const Any catalog,
 {
 const OUString *pSchemaPat = NULL;
 
-if(schemaPattern.toChar() != '%')
+if(schemaPattern != %)
 pSchemaPat = schemaPattern;
 else
 pSchemaPat = NULL;
@@ -1088,7 +1088,7 @@ void ODatabaseMetaDataResultSet::openProcedures(const 
Any catalog, const OUStri
 {
 const OUString *pSchemaPat = NULL;
 
-if(schemaPattern.toChar() != '%')
+if(schemaPattern != %)
 pSchemaPat = schemaPattern;
 else
 pSchemaPat = NULL;
@@ -1132,7 +1132,7 @@ void 
ODatabaseMetaDataResultSet::openSpecialColumns(sal_Bool _bRowVer,const Any
 
 const OUString *pSchemaPat = NULL;
 
-if(schema.toChar() != '%')
+if(schema != %)
 pSchemaPat = schema;
 else
 pSchemaPat = NULL;
@@ -1219,7 +1219,7 @@ void ODatabaseMetaDataResultSet::openPrimaryKeys(const 
Any catalog, const OUStr
 {
 const OUString *pSchemaPat = NULL;
 
-if(schema.toChar() != '%')
+if(schema != %)
 pSchemaPat = schema;
 else
 pSchemaPat = NULL;
@@ -1248,7 +1248,7 @@ void 
ODatabaseMetaDataResultSet::openTablePrivileges(const Any catalog, const O
 {
 const OUString *pSchemaPat = NULL;
 
-if(schemaPattern.toChar() != '%')
+if(schemaPattern != %)
 pSchemaPat = schemaPattern;
 else
 pSchemaPat = NULL;
@@ -1278,7 +1278,7 @@ void ODatabaseMetaDataResultSet::openIndexInfo( const 
Any catalog, const OUStri
 {
 const OUString *pSchemaPat = NULL;
 
-if(schema.toChar() != '%')
+if(schema != %)
 pSchemaPat = schema;
 else
 pSchemaPat = NULL;
___
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' - vcl/unx

2013-12-19 Thread Andrzej Hunt

 vcl/unx/generic/printer/cupsmgr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 23e8d0417c664fcb9b3f281f60629521153d6e55
Author: Andrzej Hunt andrzej.h...@collabora.com
Date:   Fri Dec 6 20:43:24 2013 +

fdo#60705 Don't discard valid printing options.

PPDValue::m_aValue is simply an optional parameter description, whereas
m_aOption is the actual option being passed to cups.

For example, for the key PageSize (which was previously passed
without problem), a typical PPDValue could be:
m_aOption = A4
m_aValue = /PageSize[595.3 841.9]/ImagingBBox nullsetpagedevice

However for the key InputSlot (which was previously not passed
to the printer), a typical PPDValue could be:
m_aOption = RearPaperFeedSlot
m_aValue = 

(cherry picked from commit 4c160e3d54ec1c6c04bc80c6cec7ee58e20af3bb)

Conflicts:
vcl/unx/generic/printer/cupsmgr.cxx

Change-Id: I7959317c9f9d67bfafd911e710927a70edfa8792
Reviewed-on: https://gerrit.libreoffice.org/6963
Reviewed-by: CaolÃ¡n McNamara caol...@redhat.com
Tested-by: CaolÃ¡n McNamara caol...@redhat.com

diff --git a/vcl/unx/generic/printer/cupsmgr.cxx 
b/vcl/unx/generic/printer/cupsmgr.cxx
index fe163bb..6b06596 100644
--- a/vcl/unx/generic/printer/cupsmgr.cxx
+++ b/vcl/unx/generic/printer/cupsmgr.cxx
@@ -618,7 +618,7 @@ void CUPSManager::getOptionsFromDocumentSetup( const 
JobData rJob, bool bBanner
 {
 const PPDKey* pKey = aKeys[i];
 const PPDValue* pValue = rJob.m_aContext.getValue( pKey );
-if(pValue  pValue-m_eType == eInvocation  
pValue-m_aValue.Len() )
+if(pValue  pValue-m_eType == eInvocation  
pValue-m_aOption.Len() )
 {
 OString aKey = OUStringToOString( pKey-getKey(), 
RTL_TEXTENCODING_ASCII_US );
 OString aValue = OUStringToOString( pValue-m_aOption, 
RTL_TEXTENCODING_ASCII_US );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sal/osl

 sal/osl/unx/uunxapi.cxx |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit df500ead2914c76983db8d40e2bad21c903b7ee9
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 19 15:16:41 2013 +0200

Fix crash on Android

Fallout from 0e6a2601b39cbadaff7f7506ba9e804f108060db (Convert code that
calls OUString::getStr()[] to use the [] operator). The code was a bit 
silly
and hand-optimized in the first place so no wonder a bug was introduced
accidentally in that commit.

Make it simpler and more obvious.

Change-Id: Idafb1c0741289e915dfbaa108383a926321764d2

diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index a9f3c5f..8d495f2 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -128,9 +128,7 @@ int access_u(const rtl_uString* pustrPath, int mode)
 {
 rtl::OString fn = OUStringToOString(pustrPath);
 #ifdef ANDROID
-if (fn.startsWith(/assets) 
-(fn[sizeof(/assets)-1] == '\0' ||
- fn[sizeof(/assets)-1] == '/'))
+if (fn == /assets || fn.startsWith(/assets/))
 {
 struct stat stat;
 if (lo_apk_lstat(fn.getStr(), stat) == -1)
@@ -161,9 +159,7 @@ sal_Bool realpath_u(const rtl_uString* pustrFileName, 
rtl_uString** ppustrResolv
 {
 rtl::OString fn = OUStringToOString(pustrFileName);
 #ifdef ANDROID
-if (fn.startsWith(/assets) 
-(fn[sizeof(/assets)-1] == '\0' ||
- fn[sizeof(/assets)-1] == '/'))
+if (fn == /assets || fn.startsWith(/assets/))
 {
 if (access_u(pustrFileName, F_OK) == -1)
 return sal_False;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-12-19 Thread Maxim Monastirsky

 sc/source/ui/dbgui/scuiasciiopt.cxx |   27 +--
 1 file changed, 21 insertions(+), 6 deletions(-)

New commits:
commit a4b5fdc2942d45c5c8aad5d77ca3346bd0862ec3
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Thu Dec 19 15:58:21 2013 +0200

Prefill correct settings for csv and tsv

Change-Id: I21f3109530bc79c6ca1dcc247da987ee4795d086
Reviewed-on: https://gerrit.libreoffice.org/7142
Reviewed-by: Michael Meeks michael.me...@collabora.com
Tested-by: Michael Meeks michael.me...@collabora.com

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 87aa28c..1cd49d6 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -288,6 +288,16 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* 
pParent,OUString aDatName,
 SetText( aName );
 }
 
+// To be able to prefill the correct values based on the file extension
+bool bIsCSV = false;
+bool bIsTSV = false;
+
+OUString aExtWithDot = aDatName.copy(aDatName.getLength() - 4); // All 
handled extensions (csv, tsv, tab) have length of 3
+if ( aExtWithDot.equalsIgnoreAsciiCase(.tsv) || 
aExtWithDot.equalsIgnoreAsciiCase(.tab) )
+bIsTSV = true;
+else if ( aExtWithDot.equalsIgnoreAsciiCase(.csv) )
+bIsCSV = true;
+
 // Default options are set in 
officecfg/registry/schema/org/openoffice/Office/Calc.xcs
 OUString sFieldSeparators(,;\t);
 OUString sTextSeparators(mcTextSep);
@@ -303,19 +313,24 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* 
pParent,OUString aDatName,
 // load from saved settings
 maFieldSeparators = OUString(sFieldSeparators);
 
-if( bMergeDelimiters )
+if( bMergeDelimiters  !bIsTSV )
 pCkbAsOnce-Check();
 if (bQuotedFieldAsText)
 pCkbQuotedAsText-Check();
 if (bDetectSpecialNum)
 pCkbDetectNumber-Check();
-if( bFixedWidth )
+if( bFixedWidth  !bIsTSV )
 pRbFixed-Check();
-if( nFromRow != 1 )
+if( nFromRow != 1  !bIsTSV )
 pNfRow-SetValue( nFromRow );
 
-// Set Separators in the dialog from maFieldSeparators (empty are not set)
-SetSeparators();
+if ( bIsTSV )
+pCkbTab-Check();
+else
+SetSeparators(); // Set Separators in the dialog from 
maFieldSeparators (empty are not set)
+
+if ( bIsCSV )
+pCkbComma-Check();
 
 // Get Separators from the dialog (empty are set from default)
 maFieldSeparators = GetSeparators();
@@ -574,7 +589,7 @@ void ScImportAsciiDlg::SetSeparators()
 case ' ':   pCkbSpace-Check();  break;
 default:
 pCkbOther-Check();
-   pEdOther-SetText( pEdOther-GetText() + OUString( aSep[i] ) );
+pEdOther-SetText( pEdOther-GetText() + OUString( aSep[i] ) );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] HiDPI fixes for squiggly underlines

2013-12-19 Thread Jan Holesovsky

Hi Keith,

Keith Curtis píše v Pá 13. 12. 2013 v 15:58 -0500:

Good to hear from you. I've got a number of things in progress on my
computer beyond the underlines
(https://wiki.documentfoundation.org/Development/HiDpi) but I wait to
get an API first as I'm just writing if (1) //hidpi.

So now it's in :-) - as:

http://cgit.freedesktop.org/libreoffice/core/commit/?id=6b5cac1ca06a052061d2fe6acff1bc1e3cb45d57

I believe it is what we want here, as that should allow us to do the
changes to the painting methods as low as possible [but not lower, as
you pointed out below]. As an example, I have updated the drawing of
the wave line; but probably needs testing on an actual hi-dpi display if
it works as expected in all situations.

I think you similarly want to update the toolbars code; see
vcl/source/window/toolbox2.cxx - I believe you want to scale images by
mnDPIScaleFactor when setting them up (in InsertItem()'s or elsewhere).

I personally don't think a floating point value is a good idea. At the
lowest level, pixel line widths go to 2 or 3 and in the square case go
to 4 or 9. I believe anything who wants more resolution should
probably be working based on the system font size. The changes I'm
making don't seem to need more than 3 and even 2 is plenty for all
laptops today and into the distant future. Floating point arithmetic
used to be a lot slower than integer as well but I don't know if that
is still true ;-)

I don't think it is critical here, things like scaling the images will
take orders of magnitude more time than one single multiplication; then
again, really no need for floats as you say, so implemented the factor
as an integer, we can change it should the need be.

I hope it is okay if I can write code that handles the 2x case but has
no guarantees about any other value. I can't test what I can't see and
there is a fair amount of work to get LibreOffice looking good and
supporting variable-sized bitmaps at all. So if it were up to me, I'd
just make it a boolean for a while, and focus / force that part to
look great everywhere.

I'd say - go ahead, and just multiply by the mnDPIScaleFactor where you
see fit; ideally as close to vcl as possible - but of course for things
like the ruler or other custom controls, you have to do it where that
one is being drawn.

My biggest concern wrt the API is that it has the right value out of
the box. For example, what do normal Macs return for the system font
size versus Retinas? What about on Windows? There is plenty of
intelligence that can go into a bit.

No idea; at the moment I do just a simple:

std::max(1, (mpWindowImpl-mpFrameData-mnDPIY + 48) / 96);

but if the system provided a setting for that, it would be ideal I
guess.

Putting the change in ImplDrawWaveLine is possible. My change is safer
in that it mostly only touches the spelling / grammar which is the
most noticeable issue. With ImplDrawWaveLine you have to worry about
more callers, printers, etc. and possibilities for dirt on screen. I
wouldn't necessarily recommend shifting down 2 pixels for the
low-level drawing code, so maybe you'd still have to have changes in
both places. ImplDrawWaveLine is a routine takes a pixel line width as
input, so perhaps the policy decision should be above it. It seems
sort of like putting the bitmap doubling logic into the BitBlt routine
versus in the toolbar which loads the bitmaps.

Yeah, correct - ImplDrawWaveLine() was indeed too low :-)

Working on this early next week would be great. I've got about 600
more lines in 14 files to review that make a difference. There is a
fair amount of low-hanging fruit. I am possibly stuck on two issues,
but I plug away on it as I have free time.

Sure - much appreciated, thanks for that! Would be great to see you on
#libreoffice-dev channel on irc.freenode.net in case you are stuck or
anything, that's the fastest way to resolve that [I am 'kendy' there].

The hardest part is finding the actual line of code that have the bug.
With my work, they are being marked which makes future work easier. I
did see code that is possibly problematic in places like DecoView but
I'm just focusing on the visible ones. Toolbar bitmaps are the most
important. The Sidebar is the most broken. Do you think they will fix
it?

Please see my toolbars related suggestion above; hopefully it'll work
for you.

Anyway, I look forward to working through the issues soon because I
have some time now and hopefully getting this into 4.2.

I am afraid we won't be able to make it to 4.2; it's too late after the
feature freeze :-( Unless we'd find people to approve it as an
Experimental feature for 4.2?

Thank you again for your work on this!

All the best,
Kendy

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

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

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

New commits:
commit 9dea39c177e61385770311077cf082aa581671fd
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 19 16:29:46 2013 +0200

Fix sal_Int32/int mismatch

Change-Id: I4775d1f9bef9c658c2f94d8310ddf544126bb973

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e689668..1bd234b 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -1713,7 +1713,7 @@ void Window::ImplInitResolutionSettings()
 mnDPIY = (mpWindowImpl-mpFrameData-mnDPIY*nScreenZoom)/100;
 
 // setup the scale factor for Hi-DPI displays
-mnDPIScaleFactor = std::max(1, (mpWindowImpl-mpFrameData-mnDPIY + 
48) / 96);
+mnDPIScaleFactor = std::max((sal_Int32)1, 
(mpWindowImpl-mpFrameData-mnDPIY + 48) / 96);
 
 SetPointFont( rStyleSettings.GetAppFont() );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - android/experimental include/osl ios/experimental ios/shared

2013-12-19 Thread Matúš Kukan

 android/experimental/DocumentLoader/native-code.cxx  |   30 +---
 android/experimental/LibreOffice4Android/native-code.cxx |   39 +--
 android/experimental/desktop/native-code.cxx |   36 +-
 include/osl/detail/component-mapping.h   |   53 ++-
 ios/experimental/LibreOffice/LibreOffice/lo.mm   |   38 +-
 ios/experimental/TiledLibreOffice/TiledLibreOffice/lo.mm |   41 +--
 ios/shared/ios_sharedlo/cxx/mlo.mm   |   32 -
 7 files changed, 86 insertions(+), 183 deletions(-)

New commits:
commit 645dac2f9434d70d4aa393bac899b9984f533b20
Author: MatÃºÅ¡ Kukan matus.ku...@collabora.com
Date:   Thu Dec 19 12:16:09 2013 +0100

Deduplicate more components.

No one says this is the only good classification.
Quite possibly it's not even a good one, but at least something.

Change-Id: I81178314222f9f63708a83b262ff8ef73a1d9467

diff --git a/android/experimental/DocumentLoader/native-code.cxx 
b/android/experimental/DocumentLoader/native-code.cxx
index 8c8a9bd..7cba377 100644
--- a/android/experimental/DocumentLoader/native-code.cxx
+++ b/android/experimental/DocumentLoader/native-code.cxx
@@ -15,29 +15,14 @@ const lib_to_factory_mapping *
 lo_get_factory_map(void)
 {
 static lib_to_factory_mapping map[] = {
-LO_CORE_FACTORY_MAP
+LO_EXTENDED_CORE_FACTORY_MAP
+LO_BASE_CORE_FACTORY_MAP
 LO_CALC_CORE_FACTORY_MAP
+LO_DRAW_CORE_FACTORY_MAP
+LO_MATH_FACTORY_MAP
 LO_WRITER_FACTORY_MAP
-{ libanimcorelo.a, animcore_component_getFactory },
-{ libavmedialo.a, avmedia_component_getFactory },
-{ libdbalo.a, dba_component_getFactory },
-{ libdbaxmllo.a, dbaxml_component_getFactory },
-{ libfrmlo.a, frm_component_getFactory },
-{ libfwklo.a, fwk_component_getFactory },
-{ libfwmlo.a, fwm_component_getFactory },
-{ libhwplo.a, hwp_component_getFactory },
 { libprotocolhandlerlo.a, protocolhandler_component_getFactory },
 { libsblo.a, sb_component_getFactory },
-{ libsddlo.a, sdd_component_getFactory },
-{ libsdlo.a, sd_component_getFactory },
-{ libsmdlo.a, smd_component_getFactory },
-{ libsmlo.a, sm_component_getFactory },
-{ libsvgfilterlo.a, svgfilter_component_getFactory },
-{ libt602filterlo.a, t602filter_component_getFactory },
-{ libtextfdlo.a, textfd_component_getFactory },
-{ libwpftdrawlo.a, wpftdraw_component_getFactory },
-{ libwpftwriterlo.a, wpftwriter_component_getFactory },
-{ libxmlfdlo.a, xmlfd_component_getFactory },
 { NULL, NULL }
 };
 
diff --git a/android/experimental/LibreOffice4Android/native-code.cxx 
b/android/experimental/LibreOffice4Android/native-code.cxx
index 7f36ce7..44cb862 100644
--- a/android/experimental/LibreOffice4Android/native-code.cxx
+++ b/android/experimental/LibreOffice4Android/native-code.cxx
@@ -15,41 +15,20 @@ const lib_to_factory_mapping *
 lo_get_factory_map(void)
 {
 static lib_to_factory_mapping map[] = {
-LO_CORE_FACTORY_MAP
+LO_EXTENDED_CORE_FACTORY_MAP
+LO_BASE_CORE_FACTORY_MAP
 LO_CALC_CORE_FACTORY_MAP
+LO_DRAW_CORE_FACTORY_MAP
+LO_MATH_FACTORY_MAP
 LO_WRITER_FACTORY_MAP
-{ libanimcorelo.a, animcore_component_getFactory },
-{ libavmedialo.a, avmedia_component_getFactory },
-{ libbasprov.uno.a, basprov_component_getFactory },
-{ libchartcorelo.a, chartcore_component_getFactory },
-{ libdlgprov.uno.a, dlgprov_component_getFactory },
-{ libdbalo.a, dba_component_getFactory },
-{ libdbaxmllo.a, dbaxml_component_getFactory },
-{ libfilterconfiglo.a, filterconfig1_component_getFactory },
-{ libfrmlo.a, frm_component_getFactory },
-{ libfwklo.a, fwk_component_getFactory },
-{ libfwmlo.a, fwm_component_getFactory },
-{ libhwplo.a, hwp_component_getFactory },
+{ libdlgprovlo.a, dlgprov_component_getFactory },
 { libprotocolhandlerlo.a, protocolhandler_component_getFactory },
 { libscriptframe.a, scriptframe_component_getFactory },
 { libsblo.a, sb_component_getFactory },
-{ libsddlo.a, sdd_component_getFactory },
-{ libsdlo.a, sd_component_getFactory },
-{ libsmdlo.a, smd_component_getFactory },
-{ libsmlo.a, sm_component_getFactory },
 { libscriptframe.a, scriptframe_component_getFactory },
 { libstringresource.uno.a, stringresource_component_getFactory },
-{ libsvgfilterlo.a, svgfilter_component_getFactory },
-{ libsvxcorelo.a, svxcore_component_getFactory },
-{ libt602filterlo.a, t602filter_component_getFactory },
-{ libtextfdlo.a, textfd_component_getFactory },
-{ libtklo.a, tk_component_getFactory },
-{ libucppkg1.a,

[Libreoffice-commits] core.git: include/osl

 include/osl/detail/component-mapping.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 37b0ec6dcbb764a07e5e080e7ecad51d94d70eef
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 19 15:49:39 2013 +0100

Missing eol backslash

Change-Id: Ia3fd6c84c430fcce30779f9b554090a322e6fd9a

diff --git a/include/osl/detail/component-mapping.h 
b/include/osl/detail/component-mapping.h
index 95625fc..b32d41b 100644
--- a/include/osl/detail/component-mapping.h
+++ b/include/osl/detail/component-mapping.h
@@ -93,7 +93,7 @@ const lib_to_constructor_mapping 
*lo_get_constructor_map(void);
 { libfwklo.a, fwk_component_getFactory }, \
 { libfwmlo.a, fwm_component_getFactory }, \
 { libsvxcorelo.a, svxcore_component_getFactory }, \
-{ libtextfdlo.a, textfd_component_getFactory },
+{ libtextfdlo.a, textfd_component_getFactory }, \
 { libtklo.a, tk_component_getFactory }, \
 { libucppkg1.a, ucppkg1_component_getFactory }, \
 { libxmlfdlo.a, xmlfd_component_getFactory }, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/view/cellsh2.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit efb0412eda9eb33e45b27d9d7d6cc94e4211a82c
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 19 16:07:53 2013 +0100

fixed crash when invoking sort on an empty sheet's entire column, fdo#72874

Change-Id: Ifc4a08069a42ca18a056c509575a4080094aa07e

diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index c408e20..9cba201 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -122,10 +122,15 @@ static sal_Bool lcl_GetSortParam( const ScViewData* 
pData, ScSortParam rSortPar
 if( rSortParam.nRow1 != rSortParam.nRow2 )
 eFillDir = DIR_TOP;
 
-SCSIZE nCount = pDoc-GetEmptyLinesInBlock( rSortParam.nCol1, 
rSortParam.nRow1, nTab, rSortParam.nCol2, rSortParam.nRow2, nTab, eFillDir );
-
 if( rSortParam.nRow2 == MAXROW )
-aExternalRange = ScRange( 
rSortParam.nCol1,sal::static_int_castSCROW( nCount ), nTab );
+{
+// Assume that user selected entire column(s), but cater for the
+// possibility that the start row is not the first row.
+SCSIZE nCount = pDoc-GetEmptyLinesInBlock( rSortParam.nCol1, 
rSortParam.nRow1, nTab,
+rSortParam.nCol2, 
rSortParam.nRow2, nTab, eFillDir );
+aExternalRange = ScRange( rSortParam.nCol1,
+::std::min( rSortParam.nRow1 + sal::static_int_castSCROW( 
nCount ), MAXROW), nTab );
+}
 else
 aExternalRange = ScRange( pData-GetCurX(), pData-GetCurY(), nTab );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source

 sc/source/ui/view/cellsh2.cxx |   11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit 585b25194bb7c24dde6d21f3674b26decffe5ed7
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 19 16:07:53 2013 +0100

fixed crash when invoking sort on an empty sheet's entire column, fdo#72874

Change-Id: Ifc4a08069a42ca18a056c509575a4080094aa07e
(cherry picked from commit efb0412eda9eb33e45b27d9d7d6cc94e4211a82c)

diff --git a/sc/source/ui/view/cellsh2.cxx b/sc/source/ui/view/cellsh2.cxx
index 71c9282..5a0720c 100644
--- a/sc/source/ui/view/cellsh2.cxx
+++ b/sc/source/ui/view/cellsh2.cxx
@@ -122,10 +122,15 @@ static sal_Bool lcl_GetSortParam( const ScViewData* 
pData, ScSortParam rSortPar
 if( rSortParam.nRow1 != rSortParam.nRow2 )
 eFillDir = DIR_TOP;
 
-SCSIZE nCount = pDoc-GetEmptyLinesInBlock( rSortParam.nCol1, 
rSortParam.nRow1, nTab, rSortParam.nCol2, rSortParam.nRow2, nTab, eFillDir );
-
 if( rSortParam.nRow2 == MAXROW )
-aExternalRange = ScRange( 
rSortParam.nCol1,sal::static_int_castSCROW( nCount ), nTab );
+{
+// Assume that user selected entire column(s), but cater for the
+// possibility that the start row is not the first row.
+SCSIZE nCount = pDoc-GetEmptyLinesInBlock( rSortParam.nCol1, 
rSortParam.nRow1, nTab,
+rSortParam.nCol2, 
rSortParam.nRow2, nTab, eFillDir );
+aExternalRange = ScRange( rSortParam.nCol1,
+::std::min( rSortParam.nRow1 + sal::static_int_castSCROW( 
nCount ), MAXROW), nTab );
+}
 else
 aExternalRange = ScRange( pData-GetCurX(), pData-GetCurY(), nTab );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 UnoControls/source/base/registercontrols.cxx |  193 ---
 1 file changed, 86 insertions(+), 107 deletions(-)

New commits:
commit 914a00a13c8f3045282e27c8717ae0fd21ad740f
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 19 16:34:54 2013 +0100

Clean up macro madness

Change-Id: I353a161fdc274a3da5ac965df12379c0d65681a4

diff --git a/UnoControls/source/base/registercontrols.cxx 
b/UnoControls/source/base/registercontrols.cxx
index 94df3e7..e3ecfa4 100644
--- a/UnoControls/source/base/registercontrols.cxx
+++ b/UnoControls/source/base/registercontrols.cxx
@@ -17,126 +17,105 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include comphelper/processfactory.hxx
-#include cppuhelper/factory.hxx
+#include sal/config.h
+
 #include com/sun/star/lang/XMultiServiceFactory.hpp
 #include com/sun/star/lang/XSingleServiceFactory.hpp
-#include com/sun/star/registry/XRegistryKey.hpp
-#include com/sun/star/container/XSet.hpp
-
-#include stdio.h
-
-//=
-//  Add new include line to use new services.
-//=
-#include framecontrol.hxx
-#include progressbar.hxx
-#include progressmonitor.hxx
-#include statusindicator.hxx
-//=
-
-//__
-//  namespaces
-//__
-
-using namespace ::rtl   ;
-using namespace ::cppu  ;
-using namespace ::unocontrols   ;
-using namespace ::com::sun::star::uno   ;
-using namespace ::com::sun::star::container ;
-using namespace ::com::sun::star::lang  ;
-using namespace ::com::sun::star::registry  ;
+#include comphelper/processfactory.hxx
+#include cppuhelper/factory.hxx
 
-//__
-//  macros
-//__
+#include framecontrol.hxx
+#include progressbar.hxx
+#include progressmonitor.hxx
+#include statusindicator.hxx
 
-//**
-#define CREATEINSTANCE(CLASS)  
 \
-   
 \
-static Reference XInterface  SAL_CALL CLASS##_createInstance ( const 
Reference XMultiServiceFactory  rServiceManager ) throw ( Exception ) \
-{  
 \
-return Reference XInterface ( *(OWeakObject*)(new CLASS( 
comphelper::getComponentContext(rServiceManager) )) );  
  \
-}
+namespace {
 
-//**
-#define CREATEFACTORY_SINGLE(CLASS)
 \
-   
 \
-/* Create right factory ... */ 
 \
-xFactory = Reference XSingleServiceFactory   
 \
-(  
 \
-cppu::createSingleFactory   (   xServiceManager
 ,   \
-
CLASS::impl_getStaticImplementationName ()  ,   \
-CLASS##_createInstance 
 ,   \
-
CLASS::impl_getStaticSupportedServiceNames  ()  )   \
-) ;
 \
+css::uno::Referencecss::uno::XInterface SAL_CALL FrameControl_createInstance(
+css::uno::Referencecss::lang::XMultiServiceFactory const 
+

*/workben, what is that?

2013-12-19 Thread Khaled Hosny

Hi all,

I was checking something and I came around a vcl/workben with a
suspiciously looking makefile.mk (looks dmake to me), and after
searching I found a few more workbens but nothing indicating what is it.

Any idea what is that, seems bit rot to me, do I need to worry about
updating anything there?

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

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

 codemaker/source/cppumaker/cpputype.cxx |   29 ++---
 1 file changed, 26 insertions(+), 3 deletions(-)

New commits:
commit e500b25b08fdab927b987949139588c198edc40b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 19 16:54:36 2013 +0100

...and support direct calls of non-default ctors, too

Change-Id: I507a5664e642c75f6e9e9fe0c95c97ea76a8e5b3

diff --git a/codemaker/source/cppumaker/cpputype.cxx 
b/codemaker/source/cppumaker/cpputype.cxx
index dc5874c..4bd7a98 100644
--- a/codemaker/source/cppumaker/cpputype.cxx
+++ b/codemaker/source/cppumaker/cpputype.cxx
@@ -3581,8 +3581,31 @@ void ServiceType::dumpHxxFile(
 o  indent()  try {\n;
 inc();
 }
-o  indent()
-   the_instance = ::css::uno::Reference 
+o  (#if defined LO_URE_CURRENT_ENV  defined 
+  LO_URE_CTOR_ENV_)
+   name_.replaceAll(., _dot_)
+ (LO_URE_CURRENT_ENV) == (LO_URE_CTOR_ENV_
+   name_.replaceAll(., _dot_)
+   )  defined LO_URE_CTOR_FUN_
+   name_.replaceAll(., _dot_)  \n  indent()
+   the_instance = ::css::uno::Reference   scopedBaseName
+   ( (::css::uno::Reference ::css::uno::XInterface (
+  static_cast ::css::uno::XInterface * ((*
+  LO_URE_CTOR_FUN_)
+   name_.replaceAll(., _dot_)
+   )(the_context.get(), ;
+if (rest) {
+o  codemaker::cpp::translateUnoToCppIdentifier(
+u2b(i-parameters.back().name), param,
+codemaker::cpp::ITM_NONGLOBAL);
+} else if (i-parameters.empty()) {
+o  (::css::uno::Sequence ::css::uno::Any ());
+} else {
+o  the_arguments;
+}
+o  (.get())), ::SAL_NO_ACQUIRE), ::css::uno::UNO_QUERY);\n
+  #else\n)
+   indent()  the_instance = ::css::uno::Reference 
scopedBaseName
( (the_context-getServiceManager()-
   createInstanceWithArgumentsAndContext(::rtl::OUString(
@@ -3597,7 +3620,7 @@ void ServiceType::dumpHxxFile(
 } else {
 o  the_arguments;
 }
-o  , the_context), ::css::uno::UNO_QUERY);\n;
+o  , the_context), ::css::uno::UNO_QUERY);\n#endif\n;
 if (!tree.getRoot()-present) {
 dec();
 o  indent()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: */workben, what is that?

2013-12-19 Thread bjoern

On Thu, Dec 19, 2013 at 05:50:57PM +0200, Khaled Hosny wrote:
 I was checking something and I came around a vcl/workben with a
 suspiciously looking makefile.mk (looks dmake to me), and after
 searching I found a few more workbens but nothing indicating what is it.
 
 Any idea what is that, seems bit rot to me, do I need to worry about
 updating anything there?

These used to be standalone apps/manual tests, just to play around with the
code specific of the module without a complete LibreOffice. As they are not
build in the default build, they were in bad shape even in old OOo times (and
newer have been moved to gbuild -- as they werent building before mostly.).

So indeed, they likely should be killed for the most part as bitrot. BUT there
is one exception I would make, which is the stuff you found first: vcl. We
might at some point create new backends for vcl (or chisel out vcl, making it a
wrapper around some other toolkit). For that, the examples in workben might be
helpful to bootstrap and test iteratively, without having to support ALL of
LibreOffice at once in the one huge step.

Best,

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

[Bug 65675] LibreOffice 4.2 most annoying bugs

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

Qubit qu...@runcibility.com changed:

   What|Removed |Added

 Depends on||72639

-- 
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

FOSDEM

2013-12-19 Thread Italo Vignoli


-- 
Italo Vignoli - it...@italovignoli.com
mob +39.348.5653829 - sip 5316...@messagenet.it
skype italovignoli - hangout italo.vign...@gmail.com


devroom.ods
Description: application/vnd.oasis.opendocument.spreadsheet
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

 sc/source/ui/dbgui/scuiasciiopt.cxx |   14 +-
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit d340d3bbcf12729adb2cd3a847bc474e3d58b286
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 19 17:33:29 2013 +0100

check string length of file name before attempting to copy

File names CAN be shorter than 4 characters if they don't have a 3
character file name extension and the filter was selected.

Change-Id: Ic25bdf44cd44d48313c748525e75318e05240e8e

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 1cd49d6..6ecdcf6 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -292,11 +292,15 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* 
pParent,OUString aDatName,
 bool bIsCSV = false;
 bool bIsTSV = false;
 
-OUString aExtWithDot = aDatName.copy(aDatName.getLength() - 4); // All 
handled extensions (csv, tsv, tab) have length of 3
-if ( aExtWithDot.equalsIgnoreAsciiCase(.tsv) || 
aExtWithDot.equalsIgnoreAsciiCase(.tab) )
-bIsTSV = true;
-else if ( aExtWithDot.equalsIgnoreAsciiCase(.csv) )
-bIsCSV = true;
+if (aDatName.getLength() = 4)
+{
+// All handled extensions (csv, tsv, tab) have length of 3
+OUString aExtWithDot = aDatName.copy(aDatName.getLength() - 4);
+if ( aExtWithDot.equalsIgnoreAsciiCase(.tsv) || 
aExtWithDot.equalsIgnoreAsciiCase(.tab) )
+bIsTSV = true;
+else if ( aExtWithDot.equalsIgnoreAsciiCase(.csv) )
+bIsCSV = true;
+}
 
 // Default options are set in 
officecfg/registry/schema/org/openoffice/Office/Calc.xcs
 OUString sFieldSeparators(,;\t);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: */workben, what is that?

On Thu, 2013-12-19 at 17:50 +0200, Khaled Hosny wrote:
 Hi all,
 
 I was checking something and I came around a vcl/workben with a
 suspiciously looking makefile.mk (looks dmake to me), and after
 searching I found a few more workbens but nothing indicating what is it.
 
 Any idea what is that, seems bit rot to me, do I need to worry about
 updating anything there?

I use sc/workben sometimes to store stuff that's important for us Calc
developers but have no relevance in the build.  Things like standalone
OpenCL detector code that we could use as a reference code, script used
to generate UTF-16 codes for some localized hard-coded text etc.

For your purpose, you can just ignore those. No worry about updating
them, but I don't want them removed.

Kohei

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

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

 sc/source/ui/dbgui/scuiasciiopt.cxx |   13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 255bd89286a09f715d08ea63681ea35f8bc8dacb
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 19 17:52:51 2013 +0100

better use OUString::endsWithIgnoreAsciiCase()

Change-Id: Ieedb71e58b1a690a38fcc93c56ea49483c224278

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 6ecdcf6..95b528c 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -292,15 +292,10 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* 
pParent,OUString aDatName,
 bool bIsCSV = false;
 bool bIsTSV = false;
 
-if (aDatName.getLength() = 4)
-{
-// All handled extensions (csv, tsv, tab) have length of 3
-OUString aExtWithDot = aDatName.copy(aDatName.getLength() - 4);
-if ( aExtWithDot.equalsIgnoreAsciiCase(.tsv) || 
aExtWithDot.equalsIgnoreAsciiCase(.tab) )
-bIsTSV = true;
-else if ( aExtWithDot.equalsIgnoreAsciiCase(.csv) )
-bIsCSV = true;
-}
+if ( aDatName.endsWithIgnoreAsciiCase(.csv) )
+bIsCSV = true;
+else if ( aDatName.endsWithIgnoreAsciiCase(.tsv) || 
aDatName.endsWithIgnoreAsciiCase(.tab) )
+bIsTSV = true;
 
 // Default options are set in 
officecfg/registry/schema/org/openoffice/Office/Calc.xcs
 OUString sFieldSeparators(,;\t);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 UnoControls/source/controls/progressbar.cxx |7 -
 UnoControls/source/controls/progressmonitor.cxx |  146 +---
 UnoControls/source/controls/statusindicator.cxx |   74 +---
 UnoControls/source/inc/progressbar.hxx  |2 
 UnoControls/source/inc/progressmonitor.hxx  |7 -
 UnoControls/source/inc/statusindicator.hxx  |7 -
 UnoControls/util/ctl.component  |   12 -
 7 files changed, 104 insertions(+), 151 deletions(-)

New commits:
commit 2dde51e17288e7fecd4fad0d9a69fffc465f536b
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 19 17:55:49 2013 +0100

Remove odd service names (that duplicate type names)

Looks like no code instantiated these via those odd service names (except 
for
ProgressMonitor/StatusIndicator instantiating ProgressBar via odd
com.sun.star.awt.XProgressBar service name until that got cleaned up in 
the
previous commit).

Also looks like no code instantiates them via their implementation names 
either
(in which case ProgressBar/ProgressMonitor/StatusIndicator would be dead 
code),
but maybe there is code that dynamically constructs those implemenation 
names
and calls creeateInstance on them?  So best leave the implementations in for
now...

Change-Id: I20b92345e343b1f776387f63d9b02a5b0a47fe21

diff --git a/UnoControls/source/controls/progressbar.cxx 
b/UnoControls/source/controls/progressbar.cxx
index 5b36956..aebf0f3 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++ b/UnoControls/source/controls/progressbar.cxx
@@ -339,9 +339,7 @@ Reference XControlModel  SAL_CALL ProgressBar::getModel() 
throw( RuntimeExcept
 
 const Sequence OUString  ProgressBar::impl_getStaticSupportedServiceNames()
 {
-Sequence OUString  seqServiceNames( 1 );
-seqServiceNames[0] = com.sun.star.awt.XProgressBar;
-return seqServiceNames ;
+return css::uno::SequenceOUString();
 }
 
 
//
diff --git a/UnoControls/source/controls/progressmonitor.cxx 
b/UnoControls/source/controls/progressmonitor.cxx
index b87dba9..ae1c2b9 100644
--- a/UnoControls/source/controls/progressmonitor.cxx
+++ b/UnoControls/source/controls/progressmonitor.cxx
@@ -628,9 +628,7 @@ void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, 
sal_Int32 nY, sal_Int3
 
 const Sequence OUString  
ProgressMonitor::impl_getStaticSupportedServiceNames()
 {
-Sequence OUString  seqServiceNames( 1 );
-seqServiceNames[0] = com.sun.star.awt.XProgressMonitor;
-return seqServiceNames ;
+return css::uno::SequenceOUString();
 }
 
 
//
diff --git a/UnoControls/source/controls/statusindicator.cxx 
b/UnoControls/source/controls/statusindicator.cxx
index bc1ae59..03f0a3b 100644
--- a/UnoControls/source/controls/statusindicator.cxx
+++ b/UnoControls/source/controls/statusindicator.cxx
@@ -400,9 +400,7 @@ void SAL_CALL StatusIndicator::setPosSize (
 
 const Sequence OUString  
StatusIndicator::impl_getStaticSupportedServiceNames()
 {
-Sequence OUString  seqServiceNames( 1 );
-seqServiceNames[0] = com.sun.star.task.XStatusIndicator;
-return seqServiceNames ;
+return css::uno::SequenceOUString();
 }
 
 
//
diff --git a/UnoControls/util/ctl.component b/UnoControls/util/ctl.component
index ce23fce..3c0437d 100644
--- a/UnoControls/util/ctl.component
+++ b/UnoControls/util/ctl.component
@@ -22,13 +22,7 @@
   implementation name=stardiv.UnoControls.FrameControl
 service name=com.sun.star.frame.FrameControl/
   /implementation
-  implementation name=stardiv.UnoControls.ProgressBar
-service name=com.sun.star.awt.XProgressBar/
-  /implementation
-  implementation name=stardiv.UnoControls.ProgressMonitor
-service name=com.sun.star.awt.XProgressMonitor/
-  /implementation
-  implementation name=stardiv.UnoControls.StatusIndicator
-service name=com.sun.star.task.XStatusIndicator/
-  /implementation
+  implementation name=stardiv.UnoControls.ProgressBar/
+  implementation name=stardiv.UnoControls.ProgressMonitor/
+  implementation name=stardiv.UnoControls.StatusIndicator/
 /component
commit f8db395a8a2ad89802a52c68c428a6d0d6bd5476
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 19 17:22:11 2013 +0100

Clean up UnoControls/source/controls/ further

...and create ProgressBar directly in ProgressMonitor/StatusIndicator, 
instead
of going via service manager.

Change-Id: I798e0c415c113cfc65d70ed17cb16aafded41a6d

diff --git a/UnoControls/source/controls/progressbar.cxx 
b/UnoControls/source/controls/progressbar.cxx
index ce7c5eb..5b36956 100644
--- a/UnoControls/source/controls/progressbar.cxx
+++

[Libreoffice-commits] core.git: include/svl svl/source

 include/svl/grabbagitem.hxx  |4 ++--
 svl/source/items/grabbagitem.cxx |8 
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit e111aa0c20c2e88d13164c025359982fc6d0bd18
Author: Miklos Vajna vmik...@collabora.co.uk
Date:   Thu Dec 19 18:31:17 2013 +0100

svl: whitespace fixes in grabbagitem

Change-Id: I363e8c0f1a51a18bf0ad0ac4f931107137fd1c58

diff --git a/include/svl/grabbagitem.hxx b/include/svl/grabbagitem.hxx
index 1e7c592..e28f213 100644
--- a/include/svl/grabbagitem.hxx
+++ b/include/svl/grabbagitem.hxx
@@ -26,7 +26,7 @@ public:
 TYPEINFO();
 
 SfxGrabBagItem();
-SfxGrabBagItem(sal_uInt16 nWhich, const std::mapOUString, 
com::sun::star::uno::Any *pMap = 0);
+SfxGrabBagItem(sal_uInt16 nWhich, const std::mapOUString, 
com::sun::star::uno::Any* pMap = 0);
 SfxGrabBagItem(const SfxGrabBagItem rItem);
 ~SfxGrabBagItem();
 
@@ -34,7 +34,7 @@ public:
 const std::mapOUString, com::sun::star::uno::Any GetGrabBag() const;
 
 virtual int operator==(const SfxPoolItem) const;
-virtual SfxPoolItem* Clone(SfxItemPool *pPool = 0) const;
+virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const;
 
 virtual bool PutValue(const com::sun::star::uno::Any rVal, sal_uInt8 
nMemberId = 0);
 virtual bool QueryValue(com::sun::star::uno::Any rVal, sal_uInt8 
nMemberId = 0) const;
diff --git a/svl/source/items/grabbagitem.cxx b/svl/source/items/grabbagitem.cxx
index 23ab2bd..1c60720 100644
--- a/svl/source/items/grabbagitem.cxx
+++ b/svl/source/items/grabbagitem.cxx
@@ -25,8 +25,8 @@ SfxGrabBagItem::SfxGrabBagItem()
 {
 }
 
-SfxGrabBagItem::SfxGrabBagItem(sal_uInt16 nWhich, const std::mapOUString, 
uno::Any *pMap) :
-SfxPoolItem( nWhich )
+SfxGrabBagItem::SfxGrabBagItem(sal_uInt16 nWhich, const std::mapOUString, 
uno::Any* pMap) :
+SfxPoolItem(nWhich)
 {
 if (pMap)
 m_aMap = *pMap;
@@ -59,7 +59,7 @@ int SfxGrabBagItem::operator==(const SfxPoolItem rItem) const
 return m_aMap == pItem-m_aMap;
 }
 
-SfxPoolItem* SfxGrabBagItem::Clone(SfxItemPool * /*pPool*/) const
+SfxPoolItem* SfxGrabBagItem::Clone(SfxItemPool* /*pPool*/) const
 {
 return new SfxGrabBagItem(*this);
 }
@@ -67,7 +67,7 @@ SfxPoolItem* SfxGrabBagItem::Clone(SfxItemPool * /*pPool*/) 
const
 bool SfxGrabBagItem::PutValue(const uno::Any rVal, sal_uInt8 /*nMemberId*/)
 {
 uno::Sequencebeans::PropertyValue aValue;
-if ( rVal = aValue )
+if (rVal = aValue)
 {
 m_aMap.clear();
 comphelper::OSequenceIteratorbeans::PropertyValue i(aValue);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Request to modify Commit #7142 about CSV import

2013-12-19 Thread Laurent BP

Hi,

I tested commit #7142
https://gerrit.libreoffice.org/#/c/7142/
which change behavior of import dialog box of text files in Calc for .CSV
and .TSV files.
This modification imposes comma as separator for CSV file. You can uncheck
this option, but when you open a new CSV file, comma is always checked:
choices about this option in your preferences is no more considered.

This is a problem for all locales which uses comma as decimal separator. In
this cases, even if .CSV files are used, the comma cannot be used as
column separator.
Could you consider as removing this part?

However, this option may be interesting for TSV file.

Thanks for your attention.



-
LibreOffice 4.1.1.2
--
View this message in context: 
http://nabble.documentfoundation.org/Request-to-modify-Commit-7142-about-CSV-import-tp4089034.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Request to modify Commit #7142 about CSV import

2013-12-19 Thread Eike Rathke-2

Hi Laurent,

On Thursday, 2013-12-19 10:03:07 -0800, Laurent BP [via Document Foundation
Mail Archive] wrote:

I tested commit #7142
https://gerrit.libreoffice.org/#/c/7142/
which change behavior of import dialog box of text files in Calc for .CSV
and .TSV files.
This modification imposes comma as separator for CSV file. You can uncheck
this option, but when you open a new CSV file, comma is always checked:
choices about this option in your preferences is no more considered.

After all, the file format is called Comma-Separated Values ... ;-)

This is a problem for all locales which uses comma as decimal separator. In
this cases, even if .CSV files are used, the comma cannot be used as
column separator.

Not true. The comma can still be used as separator, just the field
values need to be enquoted if they contain a comma. Which we do.

Could you consider as removing this part?

I understand the request however, and will consider :-)

However, this option may be interesting for TSV file.

Yup.

Eike

--
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key ID: 0x65632D3A - 2265 D7F3 A7B0 95CC 3918 630B 6A6C D5B7 6563 2D3A
Support the FSFE, care about Free Software! https://fsfe.org/support/?erack

attachment0 (853 bytes)
http://nabble.documentfoundation.org/attachment/4089040/0/attachment0

--
View this message in context:
http://nabble.documentfoundation.org/Request-to-modify-Commit-7142-about-CSV-import-tp4089034p4089040.html
Sent from the Dev mailing list archive at Nabble.com.___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Bug 65675] LibreOffice 4.2 most annoying bugs

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

V Stuart Foote vstuart.fo...@utsa.edu changed:

   What|Removed |Added

 Depends on||71946

-- 
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 65675] LibreOffice 4.2 most annoying bugs

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

Bug 65675 depends on bug 71946, which changed state.

Bug 71946 Summary: ACCESSIBILITY: experimental Windows UAA to IAccessible2 
bridge AT support misconfiguration 4.2.0.1 RC1 [a11y]
https://bugs.freedesktop.org/show_bug.cgi?id=71946

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|FIXED   |---

-- 
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: 2 commits - sc/source

 sc/source/ui/dbgui/scuiasciiopt.cxx |   13 ++---
 1 file changed, 2 insertions(+), 11 deletions(-)

New commits:
commit 52be0a739642aa10bf5ec81c512ff0a9ca854eed
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 19 20:09:19 2013 +0100

there is no reason to not set FromRow for TSV files

The FromRow setting is remembered between imports, ignoring it for TSV
may just lead to the user having it to enter again and again.

Change-Id: I869b25595cf1f15dcbd1d5028d253299d2964cd7

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 6b9978a..b73c4b0 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -314,7 +314,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* 
pParent,OUString aDatName,
 pCkbDetectNumber-Check();
 if( bFixedWidth  !bIsTSV )
 pRbFixed-Check();
-if( nFromRow != 1  !bIsTSV )
+if( nFromRow != 1 )
 pNfRow-SetValue( nFromRow );
 
 if ( bIsTSV )
commit 112e39a0a172f79ad3afa366673e1b7dfb3845f2
Author: Eike Rathke er...@redhat.com
Date:   Thu Dec 19 19:58:38 2013 +0100

reverted the CSV comma-checkbox override

While for .tsv|.tab files forcing the Tab box to be checked may be
helpful, doing the same with the Comma box for .csv files is not. Though
named Comma-Separated Values, the file format is often used with other
separators, especially with localized content where the decimal
separator is also comma to not interfer and having to enquote each
numeric field.

Users frequently importing such files would have to uncheck Comma on
each import, while if it really was a comma-separated file and such
files are imported frequently checking Comma would have to be done only
once, as the options are persistently remembered.

Change-Id: I464d453bfa4e2a793faabbabfccb5986c454496e

diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx 
b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 95b528c..6b9978a 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -289,13 +289,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* 
pParent,OUString aDatName,
 }
 
 // To be able to prefill the correct values based on the file extension
-bool bIsCSV = false;
-bool bIsTSV = false;
-
-if ( aDatName.endsWithIgnoreAsciiCase(.csv) )
-bIsCSV = true;
-else if ( aDatName.endsWithIgnoreAsciiCase(.tsv) || 
aDatName.endsWithIgnoreAsciiCase(.tab) )
-bIsTSV = true;
+bool bIsTSV = (aDatName.endsWithIgnoreAsciiCase(.tsv) || 
aDatName.endsWithIgnoreAsciiCase(.tab));
 
 // Default options are set in 
officecfg/registry/schema/org/openoffice/Office/Calc.xcs
 OUString sFieldSeparators(,;\t);
@@ -328,9 +322,6 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* 
pParent,OUString aDatName,
 else
 SetSeparators(); // Set Separators in the dialog from 
maFieldSeparators (empty are not set)
 
-if ( bIsCSV )
-pCkbComma-Check();
-
 // Get Separators from the dialog (empty are set from default)
 maFieldSeparators = GetSeparators();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 comphelper/source/misc/documentiologring.cxx |   15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 962d4b35bd53e3d37849acd325dc57861c930972
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 19 20:52:25 2013 +0100

css.logging.SimpleLogRing.create() calls initialize w/ empty Arguments

Change-Id: Iffcab3831b40ce309aa20fdb825328ebb4dd1064

diff --git a/comphelper/source/misc/documentiologring.cxx 
b/comphelper/source/misc/documentiologring.cxx
index 5b94364..a2e9de1 100644
--- a/comphelper/source/misc/documentiologring.cxx
+++ b/comphelper/source/misc/documentiologring.cxx
@@ -123,14 +123,17 @@ void SAL_CALL OSimpleLogRing::initialize( const 
uno::Sequence uno::Any  aArgu
 if ( !m_refCount )
 throw uno::RuntimeException(); // the object must be refcounted 
already!
 
-sal_Int32 nLen = 0;
-if ( aArguments.getLength() == 1  ( aArguments[0] = nLen )  nLen )
-m_aMessages.realloc( nLen );
-else
-throw lang::IllegalArgumentException(
-OUString( Nonnull size is expected as the first argument! ),
+if (aArguments.hasElements())
+{
+sal_Int32 nLen = 0;
+if ( aArguments.getLength() == 1  ( aArguments[0] = nLen )  nLen 
)
+m_aMessages.realloc( nLen );
+else
+throw lang::IllegalArgumentException(
+Nonnull size is expected as the first argument!,
 uno::Reference uno::XInterface (),
 0 );
+}
 
 m_bInitialized = sal_True;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ios/experimental

 ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h |2 
 ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m |   38 
--
 ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m  |   16 +---
 3 files changed, 37 insertions(+), 19 deletions(-)

New commits:
commit 7f02e47111eba4ec45ca02f78729b35d56839c1b
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 19 21:49:25 2013 +0200

Further minor tweaks to TiledLibreOffice

Change-Id: If1c1bbaadf8866605bf1026c4a71da0a397391a4

diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h
index fb42358..2b228e6 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.h
@@ -10,7 +10,7 @@
 
 @interface TiledView : UIView
 
-- (id)initWithFrame:(CGRect)frame andScale:(CGFloat)scale;
+- (id)initWithFrame:(CGRect)frame scale:(CGFloat)scale maxZoom:(int)maxZoom;
 
 @end
 
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
index 0fe9c94..57a13fb 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/TiledView.m
@@ -19,15 +19,15 @@
 
 @implementation TiledView
 
-- (id)initWithFrame:(CGRect)frame andScale:(CGFloat)scale
+- (id)initWithFrame:(CGRect)frame scale:(CGFloat)scale maxZoom:(int)maxZoom
 {
 self = [super initWithFrame:frame];
 if (self) {
 self.scale = scale;
 CATiledLayer *catl = (CATiledLayer*) [self layer];
 catl.tileSize = CGSizeMake(512, 512);
-catl.levelsOfDetail = 4;
-catl.levelsOfDetailBias = 4;
+catl.levelsOfDetail = log2(maxZoom) + 1;
+catl.levelsOfDetailBias = catl.levelsOfDetail - 1;
 }
 return self;
 }
@@ -39,22 +39,46 @@
 
 - (void)drawLayer:(CALayer *)layer inContext:(CGContextRef)ctx
 {
-CGContextSaveGState(ctx);
+// Even if I set the CATL's tileSize to 512x512 above, this is
+// called initially with a clip bbox of 128x128. Odd, I would have
+// expected it to be called with a bbox of 256x256.
 
 CGRect bb = CGContextGetClipBoundingBox(ctx);
+double zoomScale = [(View *) [self superview] zoomScale];
+CATiledLayer *catl = (CATiledLayer*) [self layer];
 
-// NSLog(@%.0fx%.0f@(%.0f,%.0f) %f, bb.size.width, bb.size.height, 
bb.origin.x, bb.origin.y, 1/[(View *) [self superview] zoomScale]);
+CGContextSaveGState(ctx);
 
 CGContextTranslateCTM(ctx, bb.origin.x, bb.origin.y);
+// CGContextScaleCTM(ctx, 1/zoomScale, 1/zoomScale);
+
+// CGSize tileSize = [catl tileSize];
+CGSize tileSize = bb.size;
+
+// NSLog(@bb:%.0fx%.0f@(%.0f,%.0f) zoomScale:%.0f tile:%.0fx%.0f 
at:(%.0f,%.0f) size:%.0fx%.0f, bb.size.width, bb.size.height, bb.origin.x, 
bb.origin.y, zoomScale, tileSize.width, tileSize.height, 
bb.origin.x/self.scale, bb.origin.y/self.scale, bb.size.width/self.scale, 
bb.size.height/self.scale);
 
-NSLog(@tile:%.0fx%.0f at:(%.0f,%.0f) size:%.0fx%.0f, bb.size.width, 
bb.size.height, bb.origin.x/self.scale, bb.origin.y/self.scale, 
bb.size.width/self.scale, bb.size.height/self.scale);
+// I don't really claim to fully understand all this. It does seem
+// a bit weird to be passing in a context width x height (in the
+// terminology of touch_lo_draw_tile) of 64x64, for instance, even
+// if that tile is actually going to be rendered to 128x128 actual
+// pixels. But this seems to work. Other combinations, applying
+// scaling to the CTM, etc, don't. But maybe I haven't tried hard
+// enough.
 
 touch_lo_draw_tile(ctx,
-   bb.size.width, bb.size.height,
+   tileSize.width, tileSize.height,
CGPointMake(bb.origin.x/self.scale, 
bb.origin.y/self.scale),
CGSizeMake(bb.size.width/self.scale, 
bb.size.height/self.scale));
 
 CGContextRestoreGState(ctx);
+
+// I am a bit confused about what tiles exactly I am drawing, so
+// make it perfectly obvious by drawing borders around the tiles
+CGContextSaveGState(ctx);
+CGContextSetStrokeColorWithColor(ctx, [[UIColor colorWithRed:1 green:0 
blue:0 alpha:0.5] CGColor]);
+CGContextSetLineWidth(ctx, 1);
+CGContextStrokeRect(ctx, bb);
+CGContextRestoreGState(ctx);
 }
 
 @end
diff --git a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m
index be27c09..9291b45 100644
--- a/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m
+++ b/ios/experimental/TiledLibreOffice/TiledLibreOffice/View.m
@@ -23,7 +23,9 @@
 {
 self = [super initWithFrame:frame];
 if (self) {
-[self setMaximumZoomScale:4];
+const int MAXZOOM = 4;
+
+[self setMaximumZoomScale:MAXZOOM];

Re: libebook filter sniffing cost ...

On Thu, 2013-12-19 at 13:11 +0100, David Tardon wrote:
Hi,

On Thu, Dec 12, 2013 at 10:02:57AM +, Michael Meeks wrote:
Thoughts appreciated though; is there some ordering of sniffing such
that we can prioritize common formats over less common ones ? and has
perhaps libebook got into that stack too high up ?

I think the filters are tried by their occurence in the configuration.

Not exactly. Here is how the ranking of format types is done:
http://opengrok.libreoffice.org/xref/core/filter/source/config/cache/typedetection.cxx#108

If the format type is not listed there, then it will be ranked higher
because the format detector may be defined externally inside a foreign
extension which we do not know about at compile time.

If that is really the case, we could implement simple ordering based on
filter flags, e.g., decrease priority for ALIEN and 3RDPARTYFILTER and
increase it for filters that are both IMPORT and EXPORT. That would put
.odt before .docx and that before .fb2 (which is the one from libe-book
that checks for zip content).

Well, this kind of complex ordering was how it was before, which
unfortunately created unpredictability and unreasonable degree of
randomness in deciding the order of filter detection services. That
caused us to put in a steggerring amount of ugly local hacks in order to
get his/her favortie filter to be properly detected... I'd hate to go
back to that era.

At present, we sort format types by file extension, pre-defined list of
complexity (the above list), and which application is trying to open the
file (if that's available). Other than that, we rely on each individual
detection service to do the right thing, which is to detect its own
format correctly, and reject format that's not its own, and do so at
reasonable cost. So, my preferred solution in this case is to optimize
the libebook's detection service, rather than playing around the order
of detection services to avoid this particular scenario.

Best,

Kohei

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

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - 2 commits - sc/source

 sc/source/filter/xml/xmlexprt.cxx   |   46 
 sc/source/filter/xml/xmlexprt.hxx   |1 
 sc/source/ui/docshell/datastream.cxx|9 +-
 sc/source/ui/inc/datastream.hxx |4 ++
 sc/source/ui/miscdlgs/datastreamdlg.cxx |2 -
 5 files changed, 59 insertions(+), 3 deletions(-)

New commits:
commit 2bd063d8ea57ebbf8981c601c0d0c41be1a27827
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 19 10:54:25 2013 -0500

Unlimited when the end row is MAXROW.

The top row may not always be row 1, so we can't rely on the total row 
count.

Change-Id: Ia13bf6931636b15c8b673d3eed91488e6cec0def

diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx 
b/sc/source/ui/miscdlgs/datastreamdlg.cxx
index 17b9e6e..cc58195 100644
--- a/sc/source/ui/miscdlgs/datastreamdlg.cxx
+++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx
@@ -126,7 +126,7 @@ void DataStreamDlg::Init( const DataStream rStrm )
 m_pEdRange-SetText(aStr);
 SCROW nRows = aRange.aEnd.Row() - aRange.aStart.Row() + 1;
 
-if (nRows == MAXROWCOUNT)
+if (aRange.aEnd.Row() == MAXROW)
 m_pRBUnlimited-Check();
 else
 {
commit 02a86f8b4eaad15f32c8c84c8e25c330a11d7b58
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 19 10:31:41 2013 -0500

Save the data stream settings to ODS but only for 1.2 extended.

And only when the experimental mode is turned on.

Change-Id: I49dc8a2588cae5ee4a987a47d882672efb93e1c2

diff --git a/sc/source/filter/xml/xmlexprt.cxx 
b/sc/source/filter/xml/xmlexprt.cxx
index 74c20da..f8851f1 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -62,6 +62,7 @@
 #include editattributemap.hxx
 #include arealink.hxx
 #include datastream.hxx
+#include documentlinkmgr.hxx
 
 #include xmloff/xmltoken.hxx
 #include xmloff/xmlnmspe.hxx
@@ -109,6 +110,7 @@
 #include editeng/outlobj.hxx
 #include svx/svditer.hxx
 #include svx/svdpage.hxx
+#include svtools/miscopt.hxx
 
 #include comphelper/processfactory.hxx
 #include com/sun/star/beans/XPropertySet.hpp
@@ -1943,6 +1945,7 @@ void ScXMLExport::_ExportContent()
 }
 WriteExternalRefCaches();
 WriteNamedExpressions();
+WriteDataStream();
 aExportDatabaseRanges.WriteDatabaseRanges();
 ScXMLExportDataPilot aExportDataPilot(*this);
 aExportDataPilot.WriteDataPilots(xSpreadDoc);
@@ -4039,6 +4042,49 @@ void ScXMLExport::WriteNamedExpressions()
 WriteNamedRange(pNamedRanges);
 }
 
+void ScXMLExport::WriteDataStream()
+{
+if (!pDoc)
+return;
+
+SvtMiscOptions aMiscOptions;
+if (!aMiscOptions.IsExperimentalMode())
+// Export this only in experimental mode.
+return;
+
+if (getDefaultVersion() = SvtSaveOptions::ODFVER_012)
+// Export this only for 1.2 extended and above.
+return;
+
+const sc::DocumentLinkManager rMgr = pDoc-GetDocLinkManager();
+const sc::DataStream* pStrm = rMgr.getDataStream();
+if (!pStrm)
+// No data stream.
+return;
+
+// Source URL
+AddAttribute(XML_NAMESPACE_XLINK, XML_HREF, 
GetRelativeReference(pStrm-GetURL()));
+
+// Streamed range
+ScRange aRange = pStrm-GetRange();
+OUString aRangeStr;
+ScRangeStringConverter::GetStringFromRange(
+aRangeStr, aRange, pDoc, formula::FormulaGrammar::CONV_OOO);
+AddAttribute(XML_NAMESPACE_TABLE, XML_TARGET_RANGE_ADDRESS, aRangeStr);
+
+// Empty line refresh option.
+AddAttribute(XML_NAMESPACE_CALC_EXT, XML_EMPTY_LINE_REFRESH, 
pStrm-IsRefreshOnEmptyLine() ? XML_TRUE : XML_FALSE);
+
+// New data insertion position. Either top of bottom. Default to bottom.
+xmloff::token::XMLTokenEnum eInsertPosition = XML_BOTTOM;
+if (pStrm-GetMove() == sc::DataStream::MOVE_DOWN)
+eInsertPosition = XML_TOP;
+
+AddAttribute(XML_NAMESPACE_CALC_EXT, XML_INSERTION_POSITION, 
eInsertPosition);
+
+SvXMLElementExport aElem(*this, XML_NAMESPACE_CALC_EXT, 
XML_DATA_STREAM_SOURCE, true, true);
+}
+
 void ScXMLExport::WriteNamedRange(ScRangeName* pRangeName)
 {
 //write a global or local ScRangeName
diff --git a/sc/source/filter/xml/xmlexprt.hxx 
b/sc/source/filter/xml/xmlexprt.hxx
index 4ece1d5..564009d 100644
--- a/sc/source/filter/xml/xmlexprt.hxx
+++ b/sc/source/filter/xml/xmlexprt.hxx
@@ -198,6 +198,7 @@ class ScXMLExport : public SvXMLExport
 void WriteTheLabelRanges(const com::sun::star::uno::Reference 
com::sun::star::sheet::XSpreadsheetDocument  xSpreadDoc);
 void WriteLabelRanges( const com::sun::star::uno::Reference 
com::sun::star::container::XIndexAccess  xRangesIAccess, bool bColumn );
 void WriteNamedExpressions();
+void WriteDataStream();
 void WriteNamedRange(ScRangeName* pRangeName);
 void ExportConditionalFormat(SCTAB nTab);
 void WriteExternalRefCaches();
diff --git a/sc/source/ui/docshell/datastream.cxx 
b/sc/source/ui/docshell/datastream.cxx
index a68d338..edd0e2a 100644
---

Re: libebook filter sniffing cost ...

2013-12-19 Thread Michael Meeks


On Thu, 2013-12-19 at 15:01 -0500, Kohei Yoshida wrote:
 So, my preferred solution in this case is to optimize
 the libebook's detection service, rather than playing around the order
 of detection services to avoid this particular scenario.

Quite :-) doing lots of small reads (or writes) from an XStream (or an
IStream on windows) introduces some significant performance problems
whatever we do; it'd be great to have a nice caching stream
implementation to wrap / proxy such things I guess.

ATB,

Michael.

-- 
 michael.me...@collabora.com  , Pseudo Engineer, itinerant idiot

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

minutes of ESC call ...

2013-12-19 Thread Michael Meeks

* Present:
+ Eike, Miklos, Kendy, Caolan, Lionel, Norbert, Kohei, Michael M,
  Andras, Stephan, Cloph,Robinson, Bjoern, Bjoern, Adam
 
.* Completed Action Items:
+ add boolean key to lock-down Expert config (Kendy)
+ work on Keith's initial HiDPI patch and/or adapt (Kendy)
[ got the framewok into master ]
+ get a URL to Florian R to test Windows bibisect with (Cloph)
[ up-loading a repo with 29 builds for testing, the bundle after
  git GC is 340Mb, 10Mb per build or so ]
+ Open a separate product - for pre-releases for Android  iOS (Cloph)
[ instead we can have people opt-in for Alpha / Beta / testing etc. ]
 
* Pending Action Items:
+ partition document test loads / run them on tinderboxen (Norbert)
[ stalled ]
+ need design for copying styles between templates (Cor Nouws/other UX?)
cf. 
http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01658.html

http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01663.html
+ Buy an iPhone for testing vs. Dev. budget (Cloph)
+ Review patches in the queue (Andrzej)
[ blocking getting an Android pre-release of this out ]
 
* Release Engineering update (Christian)
+ 4.1.4 RC2 - announced to public on Wednesday
+ current stable version, auto-update enabled tomorrow.
+ 4.2.0 RC1 - announced to QA and early-announce list
+ will be announced to the public shortly.
+ windows build has the enable-symbols option [whoot]
+ we have a Windows symbol server here:
 http://dev-downloads.libreoffice.org/symstore/symbols/
+ [ did we test it ? (Kendy)
tested whether the symbols can be resolved with a tool (Cloph)
would appreciate QA guys doing real stack unwinding testing of
crashes. ]
+ Then a Christmas break of 2x weeks in the schedule ...
+ 4.2 - next deadline Jan 6th. (hard code freeze and branch-off)
+ GSOC / Android  iOS remote control pre-releases for 4.2
+ 4.2 Feature freeze update / status
+ 4.2 MAB count - still v. high for this point in the cycle.
+ GL / chart pieces (Michael/Moggi)
[ tripple review for 4.2.1 ? ]
+ DataStreams re-work (Kohei)
[ huge change in this, but it's experimental only, needs to be 
cleaned
  no objections, experimental only (Norbert) ]
+ please ensure that release notes are up-to-date:
+ https://wiki.documentfoundation.org/ReleaseNotes/4.2
+ FOSDEM/UX-Hackfest/LibreOffice 4.2.0 release all around the same date
+ good idea to prepare FOSDEM slides early (Bjoern)
+ should release before it - mid-week 30th or so (Norbert)
 
* Christmas break:
+ next ESC call on 9th January.
 
* Crashtest update (Markus)
+ cf. http://dev-builds.libreoffice.org/crashtest/
  new crash testing result is available (cf. the date  git hash)
  All files tested, and the results are complete for the 1st time.
  and that all odb files are not valid according to the validator
+ need to look at the standard (Lionel)
+ presumably some silly error ...
+ note that except by dumping firebird / hsqldb
  database into the standard, we'll not get a fully interoperable 
std.
+ very helpful if you just add test files to given directory
  for import/export crashers (Miklos)
+ implemented so that if you fix an export crasher.
+ just copy the file into: eg.
  sw/qa/core/exportdata/
 
* FOSDEM (Kendy)
+ Should register our talks in Pentabarf
   + https://penta.fosdem.org/submission/FOSDEM14
+ Standard Hotel 'Astrid' bookings to share at:
   + http://www.astridhotel.be/index-en.html
+ Usability hack-fest 2x days after FOSDEM:
   + https://wiki.documentfoundation.org/Hackfest/FOSDEM2014#Participants
  + good to register ...
 
* Certification update (Kendy/Bjoern/Stephan)
+ look into a new round next year.
 
* Update Dialog: Remove install button? (Robinson)
 + This has been broken for quite some time; Hide it until we can make it 
work ?
AI:  + either hide, or better make it work (Andras / Kendy)
 
* QA asks: What's our message re: the last version in a release series? 
(Robinson)
   + what message do we give ? should we announce and/or transition users over 
to
 the next release series sooner ? ie. don't update to a dead-end version ?
   + people filing bugs. vs. 4.0.6 (or sim.) should be made aware that the 
release
 is not supported ? (Bjoern)
   + it's normal to have to tell people to update to file a bug (Norbert)
+ we make this reasonably clear in the release announcement (Michael)
+ less clear for people who are updating (Robinson)
+ sometimes we don't know if it is really the last (Norbert)
   + if someone tries to keep their ver.

[Libreoffice-commits] core.git: Branch 'private/kohei/calc-data-stream' - sc/inc sc/Library_sc.mk sc/source

 sc/Library_sc.mk|2 +
 sc/inc/importfilterdata.hxx |   49 
 sc/inc/xmlwrap.hxx  |6 +++
 sc/source/filter/importfilterdata.cxx   |   19 
 sc/source/filter/xml/xmlbodyi.cxx   |4 ++
 sc/source/filter/xml/xmlimprt.cxx   |   31 
 sc/source/filter/xml/xmlimprt.hxx   |   27 -
 sc/source/filter/xml/xmlwrap.cxx|9 +
 sc/source/ui/docshell/datastream.cxx|2 -
 sc/source/ui/docshell/docsh.cxx |   34 ++
 sc/source/ui/miscdlgs/datastreamdlg.cxx |2 +
 11 files changed, 183 insertions(+), 2 deletions(-)

New commits:
commit 2ca435ad62891627a2da68b028a10b742396c5f9
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 19 15:17:49 2013 -0500

Properly import data stream data from ods.

Change-Id: Iedae2226ba08c614f1b700a5444715a990899d38

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 8eeab59..11f4d06 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -269,6 +269,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/core/tool/userlist \
 sc/source/core/tool/viewopti \
 sc/source/core/tool/zforauto \
+sc/source/filter/xml/datastreamimport \
 sc/source/filter/xml/XMLCalculationSettingsContext \
 sc/source/filter/xml/XMLCellRangeSourceContext \
 sc/source/filter/xml/XMLChangeTrackingExportHelper \
@@ -324,6 +325,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/filter/xml/xmltabi \
 sc/source/filter/xml/xmlwrap \
 sc/source/filter/chart/chart_imp \
+sc/source/filter/importfilterdata \
 sc/source/ui/Accessibility/AccessibilityHints \
 sc/source/ui/Accessibility/AccessibleCell \
 sc/source/ui/Accessibility/AccessibleCellBase \
diff --git a/sc/inc/importfilterdata.hxx b/sc/inc/importfilterdata.hxx
new file mode 100644
index 000..23cef83
--- /dev/null
+++ b/sc/inc/importfilterdata.hxx
@@ -0,0 +1,49 @@
+/* -*- 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/.
+ */
+
+#ifndef SC_IMPORTFILTERDATA_HXX
+#define SC_IMPORTFILTERDATA_HXX
+
+#include address.hxx
+
+#include boost/noncopyable.hpp
+#include boost/scoped_ptr.hpp
+
+namespace sc {
+
+/**
+ * Stores data imported from the file that need to be processed at the end
+ * of the import process.
+ */
+struct ImportPostProcessData : boost::noncopyable
+{
+/**
+ * Data stream data needs to be post-processed because it requires
+ * ScDocShell instance which is not available in the filter code.
+ */
+struct DataStream
+{
+enum InsertPos { InsertTop, InsertBottom };
+
+OUString maURL;
+ScRange maRange;
+bool mbRefreshOnEmpty;
+InsertPos meInsertPos;
+
+DataStream();
+};
+
+boost::scoped_ptrDataStream mpDataStream;
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index fb7b156..107ceb4 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -25,6 +25,8 @@
 #include com/sun/star/uno/Sequence.hxx
 #include com/sun/star/frame/XModel.hpp
 
+#include importfilterdata.hxx
+
 class ScDocument;
 class SfxMedium;
 class ScMySharedData;
@@ -44,6 +46,8 @@ namespace com { namespace sun { namespace star {
 
 class ScXMLImportWrapper
 {
+sc::ImportPostProcessData maPostProcessData;
+
 ScDocument rDoc;
 SfxMedium*  pMedium;
 ::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage  
xStorage;
@@ -70,6 +74,8 @@ public:
 ScXMLImportWrapper(ScDocument rD, SfxMedium* pM, const 
::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage );
 sal_Bool Import(sal_Bool bStylesOnly, ErrCode );
 sal_Bool Export(sal_Bool bStylesOnly);
+
+const sc::ImportPostProcessData GetImportPostProcessData() const;
 };
 
 class ScXMLChartExportWrapper
diff --git a/sc/source/filter/importfilterdata.cxx 
b/sc/source/filter/importfilterdata.cxx
new file mode 100644
index 000..1001889
--- /dev/null
+++ b/sc/source/filter/importfilterdata.cxx
@@ -0,0 +1,19 @@
+/* -*- 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/.
+ */
+
+#include importfilterdata.hxx
+
+namespace sc {
+
+ImportPostProcessData::DataStream::DataStream() :
+mbRefreshOnEmpty(false), meInsertPos(InsertBottom) {}
+
+}
+
+/* vim:set shiftwidth=4

[Libreoffice-commits] core.git: 10 commits - include/xmloff sc/inc sc/Library_sc.mk sc/source xmloff/source

 include/xmloff/xmltoken.hxx   |3 
 sc/Library_sc.mk  |3 
 sc/inc/document.hxx   |5 +
 sc/inc/documentlinkmgr.hxx|   36 +++
 sc/inc/importfilterdata.hxx   |   49 ++
 sc/inc/xmlwrap.hxx|6 +
 sc/source/core/data/documen2.cxx  |   14 ++
 sc/source/core/data/documen8.cxx  |5 -
 sc/source/filter/importfilterdata.cxx |   19 +++
 sc/source/filter/xml/xmlbodyi.cxx |4 
 sc/source/filter/xml/xmlcelli.cxx |   20 
 sc/source/filter/xml/xmlexprt.cxx |   58 +---
 sc/source/filter/xml/xmlexprt.hxx |1 
 sc/source/filter/xml/xmlimprt.cxx |   31 ++
 sc/source/filter/xml/xmlimprt.hxx |   27 +
 sc/source/filter/xml/xmlwrap.cxx  |9 +
 sc/source/ui/docshell/datastream.cxx  |  143 ++
 sc/source/ui/docshell/docsh.cxx   |   34 +++
 sc/source/ui/docshell/documentlinkmgr.cxx |   44 +
 sc/source/ui/inc/datastream.hxx   |   19 +--
 sc/source/ui/inc/datastreamdlg.hxx|8 -
 sc/source/ui/miscdlgs/datastreamdlg.cxx   |   54 ++-
 sc/source/ui/view/cellsh2.cxx |   58 ++--
 xmloff/source/core/xmltoken.cxx   |3 
 24 files changed, 435 insertions(+), 218 deletions(-)

New commits:
commit 23f09302199c903b63064760d9d4a3fd34ff0fe5
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 19 15:17:49 2013 -0500

Properly import data stream data from ods.

Change-Id: Iedae2226ba08c614f1b700a5444715a990899d38

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 8eeab59..11f4d06 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -269,6 +269,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/core/tool/userlist \
 sc/source/core/tool/viewopti \
 sc/source/core/tool/zforauto \
+sc/source/filter/xml/datastreamimport \
 sc/source/filter/xml/XMLCalculationSettingsContext \
 sc/source/filter/xml/XMLCellRangeSourceContext \
 sc/source/filter/xml/XMLChangeTrackingExportHelper \
@@ -324,6 +325,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
 sc/source/filter/xml/xmltabi \
 sc/source/filter/xml/xmlwrap \
 sc/source/filter/chart/chart_imp \
+sc/source/filter/importfilterdata \
 sc/source/ui/Accessibility/AccessibilityHints \
 sc/source/ui/Accessibility/AccessibleCell \
 sc/source/ui/Accessibility/AccessibleCellBase \
diff --git a/sc/inc/importfilterdata.hxx b/sc/inc/importfilterdata.hxx
new file mode 100644
index 000..23cef83
--- /dev/null
+++ b/sc/inc/importfilterdata.hxx
@@ -0,0 +1,49 @@
+/* -*- 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/.
+ */
+
+#ifndef SC_IMPORTFILTERDATA_HXX
+#define SC_IMPORTFILTERDATA_HXX
+
+#include address.hxx
+
+#include boost/noncopyable.hpp
+#include boost/scoped_ptr.hpp
+
+namespace sc {
+
+/**
+ * Stores data imported from the file that need to be processed at the end
+ * of the import process.
+ */
+struct ImportPostProcessData : boost::noncopyable
+{
+/**
+ * Data stream data needs to be post-processed because it requires
+ * ScDocShell instance which is not available in the filter code.
+ */
+struct DataStream
+{
+enum InsertPos { InsertTop, InsertBottom };
+
+OUString maURL;
+ScRange maRange;
+bool mbRefreshOnEmpty;
+InsertPos meInsertPos;
+
+DataStream();
+};
+
+boost::scoped_ptrDataStream mpDataStream;
+};
+
+}
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/inc/xmlwrap.hxx b/sc/inc/xmlwrap.hxx
index fb7b156..107ceb4 100644
--- a/sc/inc/xmlwrap.hxx
+++ b/sc/inc/xmlwrap.hxx
@@ -25,6 +25,8 @@
 #include com/sun/star/uno/Sequence.hxx
 #include com/sun/star/frame/XModel.hpp
 
+#include importfilterdata.hxx
+
 class ScDocument;
 class SfxMedium;
 class ScMySharedData;
@@ -44,6 +46,8 @@ namespace com { namespace sun { namespace star {
 
 class ScXMLImportWrapper
 {
+sc::ImportPostProcessData maPostProcessData;
+
 ScDocument rDoc;
 SfxMedium*  pMedium;
 ::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage  
xStorage;
@@ -70,6 +74,8 @@ public:
 ScXMLImportWrapper(ScDocument rD, SfxMedium* pM, const 
::com::sun::star::uno::Reference ::com::sun::star::embed::XStorage );
 sal_Bool Import(sal_Bool bStylesOnly, ErrCode );
 sal_Bool Export(sal_Bool bStylesOnly);
+
+const sc::ImportPostProcessData GetImportPostProcessData() const;
 };
 
 class ScXMLChartExportWrapper
diff --git a/sc/source/filter/importfilterdata.cxx

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

 sc/source/filter/xml/datastreamimport.cxx |   92 ++
 sc/source/filter/xml/datastreamimport.hxx |   39 
 2 files changed, 131 insertions(+)

New commits:
commit c7794f592500f43ca7b83535389de6b4fa717173
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date:   Thu Dec 19 15:47:19 2013 -0500

I forgot to check in these files.

Change-Id: Ibb0d6c85ba6de2085ce699c1ef1a3b54f8ae66dc

diff --git a/sc/source/filter/xml/datastreamimport.cxx 
b/sc/source/filter/xml/datastreamimport.cxx
new file mode 100644
index 000..3c5f17d
--- /dev/null
+++ b/sc/source/filter/xml/datastreamimport.cxx
@@ -0,0 +1,92 @@
+/* -*- 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/.
+ */
+
+#include datastreamimport.hxx
+#include xmlimprt.hxx
+
+#include rangeutl.hxx
+#include importfilterdata.hxx
+#include xmloff/nmspmap.hxx
+#include xmloff/xmltoken.hxx
+#include formula/grammar.hxx
+
+using namespace com::sun::star;
+using namespace xmloff::token;
+
+ScXMLDataStreamContext::ScXMLDataStreamContext(
+ScXMLImport rImport, sal_uInt16 nPrefix, const OUString rLocalName,
+const com::sun::star::uno::Reference
+com::sun::star::xml::sax::XAttributeList xAttrList ) :
+ScXMLImportContext(rImport, nPrefix, rLocalName),
+mbRefreshOnEmpty(false),
+meInsertPos(sc::ImportPostProcessData::DataStream::InsertBottom)
+{
+if (!xAttrList.is())
+return;
+
+const SvXMLTokenMap rAttrTokenMap = 
GetScImport().GetDataStreamAttrTokenMap();
+
+for (sal_Int32 i = 0; i  xAttrList-getLength(); ++i)
+{
+const OUString rName = xAttrList-getNameByIndex(i);
+OUString aLocalName;
+sal_uInt16 nLocalPrefix =
+GetScImport().GetNamespaceMap().GetKeyByAttrName(rName, 
aLocalName);
+
+const OUString rVal = xAttrList-getValueByIndex(i);
+switch (rAttrTokenMap.Get(nLocalPrefix, aLocalName))
+{
+case XML_TOK_DATA_STREAM_ATTR_URL:
+maURL = GetScImport().GetAbsoluteReference(rVal);
+break;
+case XML_TOK_DATA_STREAM_ATTR_RANGE:
+{
+ScDocument* pDoc = GetScImport().GetDocument();
+sal_Int32 nOffset = 0;
+if (!ScRangeStringConverter::GetRangeFromString(
+maRange, rVal, pDoc, formula::FormulaGrammar::CONV_OOO, 
nOffset))
+maRange.SetInvalid();
+}
+break;
+case XML_TOK_DATA_STREAM_ATTR_EMPTY_LINE_REFRESH:
+mbRefreshOnEmpty = IsXMLToken(rVal, XML_TRUE);
+break;
+case XML_TOK_DATA_STREAM_ATTR_INSERTION_POSITION:
+meInsertPos = IsXMLToken(rVal, XML_TOP) ?
+sc::ImportPostProcessData::DataStream::InsertTop :
+sc::ImportPostProcessData::DataStream::InsertBottom;
+break;
+default:
+;
+}
+}
+}
+
+ScXMLDataStreamContext::~ScXMLDataStreamContext() {}
+
+void ScXMLDataStreamContext::EndElement()
+{
+if (!maRange.IsValid())
+// Range must be valid.
+return;
+
+sc::ImportPostProcessData* pData = GetScImport().GetPostProcessData();
+if (!pData)
+return;
+
+pData-mpDataStream.reset(new sc::ImportPostProcessData::DataStream);
+sc::ImportPostProcessData::DataStream rData = *pData-mpDataStream;
+
+rData.maURL = maURL;
+rData.maRange = maRange;
+rData.mbRefreshOnEmpty = mbRefreshOnEmpty;
+rData.meInsertPos = meInsertPos;
+}
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/filter/xml/datastreamimport.hxx 
b/sc/source/filter/xml/datastreamimport.hxx
new file mode 100644
index 000..a1b675b
--- /dev/null
+++ b/sc/source/filter/xml/datastreamimport.hxx
@@ -0,0 +1,39 @@
+/* -*- 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/.
+ */
+
+#ifndef SC_XML_DATASTREAMIMPORT_HXX
+#define SC_XML_DATASTREAMIMPORT_HXX
+
+#include importcontext.hxx
+
+#include importfilterdata.hxx
+#include address.hxx
+
+class ScXMLDataStreamContext : public ScXMLImportContext
+{
+OUString maURL;
+ScRange maRange;
+bool mbRefreshOnEmpty;
+bool mbInsertBottom;
+sc::ImportPostProcessData::DataStream::InsertPos meInsertPos;
+
+public:
+ScXMLDataStreamContext(
+ScXMLImport rImport, sal_uInt16 nPrefix, const OUString rLocalName,
+const

[Libreoffice-commits] core.git: sc/inc sc/source sc/uiconfig sc/UIConfig_scalc.mk

 sc/UIConfig_scalc.mk|1 
 sc/inc/sc.hrc   |2 
 sc/inc/scabstdlg.hxx|2 
 sc/source/ui/attrdlg/scdlgfact.cxx  |   17 
 sc/source/ui/attrdlg/scdlgfact.hxx  |2 
 sc/source/ui/inc/shtabdlg.hxx   |   12 +--
 sc/source/ui/miscdlgs/shtabdlg.cxx  |   41 --
 sc/source/ui/src/miscdlgs.src   |   47 ---
 sc/source/ui/view/tabvwsh3.cxx  |2 
 sc/source/ui/view/tabvwshf.cxx  |2 
 sc/uiconfig/scalc/ui/showsheetdialog.ui |  126 
 11 files changed, 154 insertions(+), 100 deletions(-)

New commits:
commit 3b385c20d8c50e11ef02006f0dab4fd8cf360e5b
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 20:49:34 2013 +

convert show sheets dialog to .ui

Change-Id: Ia32aa742b426872c6634a431170c441ae3c8c963

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 248e8b1..77e54f4 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -124,6 +124,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/sharedocumentdlg \
sc/uiconfig/scalc/ui/sharedfooterdialog \
sc/uiconfig/scalc/ui/sharedheaderdialog \
+   sc/uiconfig/scalc/ui/showsheetdialog \
sc/uiconfig/scalc/ui/sidebaralignment \
sc/uiconfig/scalc/ui/sidebarnumberformat \
sc/uiconfig/scalc/ui/sidebarcellappearance \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index e757185..c22b064 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1063,8 +1063,6 @@
 
 // derivations from RID_SCDLG_SELENTRY
 
-#define RID_SCDLG_SHOW_TAB  (SC_DIALOGS_START + 109)
-
 #define RID_SCPAGE_CONTENT  (SC_DIALOGS_START + 113)
 #define RID_SCPAGE_LAYOUT   (SC_DIALOGS_START + 114)
 
diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 70bf915..371a362 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -452,7 +452,7 @@ public:
 virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* 
pParent, const OUString rName,
 int nId,
 sal_Bool bEdit 
= false, sal_Bool bSheetProtected = false ) = 0;
-virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int 
nId ) = 0;
+virtual AbstractScShowTabDlg * CreateScShowTabDlg(Window* pParent) = 0;
 
 virtual AbstractScStringInputDlg * CreateScStringInputDlg (  Window* 
pParent,
 const 
OUString rTitle,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 931de9f..8df625b 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -1004,21 +1004,10 @@ AbstractScNewScenarioDlg * 
ScAbstractDialogFactory_Impl::CreateScNewScenarioDlg
 return 0;
 }
 
-AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( 
Window* pParent, int nId )
+AbstractScShowTabDlg * 
ScAbstractDialogFactory_Impl::CreateScShowTabDlg(Window* pParent)
 {
-ScShowTabDlg * pDlg=NULL;
-switch ( nId )
-{
-case RID_SCDLG_SHOW_TAB :
-pDlg = new ScShowTabDlg( pParent);
-break;
-default:
-break;
-}
-
-if ( pDlg )
-return new AbstractScShowTabDlg_Impl( pDlg );
-return 0;
+ScShowTabDlg * pDlg = new ScShowTabDlg( pParent);
+return new AbstractScShowTabDlg_Impl( pDlg );
 }
 
 AbstractScStringInputDlg * 
ScAbstractDialogFactory_Impl::CreateScStringInputDlg (  Window* pParent,
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 4b5ae12..6829114 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -521,7 +521,7 @@ public:
 virtual AbstractScNewScenarioDlg * CreateScNewScenarioDlg ( Window* 
pParent, const OUString rName,
 int nId,
 sal_Bool bEdit 
= false, sal_Bool bSheetProtected = false );
-virtual AbstractScShowTabDlg * CreateScShowTabDlg ( Window* pParent, int 
nId );
+virtual AbstractScShowTabDlg * CreateScShowTabDlg(Window* pParent);
 
 virtual AbstractScStringInputDlg * CreateScStringInputDlg (  Window* 
pParent,
 const 
OUString rTitle,
diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx
index 326a0f4..6ba02b6 100644
--- a/sc/source/ui/inc/shtabdlg.hxx
+++ b/sc/source/ui/inc/shtabdlg.hxx
@@ -20,9 +20,9 @@
 #ifndef SC_SHTABDLG_HXX
 #define SC_SHTABDLG_HXX
 
-#include vcl/fixed.hxx
 #include vcl/button.hxx
 #include vcl/dialog.hxx
+#include vcl/layout.hxx
 #include vcl/lstbox.hxx

[Libreoffice-commits] core.git: helpcontent2

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

New commits:
commit efdd6c57a06e0a9c2bc137a8464565861ecbcdaa
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 20:57:56 2013 +

Updated core
Project: help  d78985d6be013988b7bd5e55fd6ff8e55457dba8

diff --git a/helpcontent2 b/helpcontent2
index 60772893..d78985d 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 60772893d33ffe9ff5d9ae2e1ec8d437781ab1d1
+Subproject commit d78985d6be013988b7bd5e55fd6ff8e55457dba8
___
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

 helpers/help_hid.lst  |1 -
 source/text/scalc/01/05050300.xhp |4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

New commits:
commit d78985d6be013988b7bd5e55fd6ff8e55457dba8
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 20:57:56 2013 +

update help ids for show sheet dialog .ui conversion

Change-Id: I5eb21722319d318135da9e4c78d3cd0412e8a084

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 589b1f3..342b968 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -6160,7 +6160,6 @@ 
sc_MultiLineEdit_RID_SCDLG_NEWSCENARIO_ED_COMMENT,1493846541,
 sc_MultiLineEdit_TP_VALIDATION_VALUES_EDT_LIST,548276765,
 sc_MultiListBox_RID_SCDLG_DPDATAFIELD_LB_FUNC,1495387137,
 sc_MultiListBox_RID_SCDLG_PIVOTSUBT_LB_FUNC,1493830657,
-sc_MultiListBox_RID_SCDLG_SHOW_TAB_LB_ENTRYLIST,1494993931,
 sc_NumericField_RID_SCDLG_DPDATEGROUP_ED_NUMDAYS,1495439364,
 sc_NumericField_RID_SCDLG_DPSUBTOTAL_OPT_NF_SHOW,1495406593,
 sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
diff --git a/source/text/scalc/01/05050300.xhp 
b/source/text/scalc/01/05050300.xhp
index 6780556..3721573 100644
--- a/source/text/scalc/01/05050300.xhp
+++ b/source/text/scalc/01/05050300.xhp
@@ -39,7 +39,7 @@
   section id=howtoget
   embed href=text/scalc/00/0405.xhp#fotenb/
 /section
-  bookmark branch=hid/sc:MultiListBox:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST 
xml-lang=en-US id=bm_id3149260 localize=false/paragraph role=heading 
level=2 id=hd_id3151112 l10n=U xml-lang=en-US oldref=3Hidden 
sheets/paragraph
-  paragraph l10n=U role=paragraph id=par_id3145273 xml-lang=en-US 
oldref=4ahelp hid=SC:MULTILISTBOX:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST 
visibility=visibleDisplays a list of all hidden sheets in your spreadsheet 
document./ahelp To show a certain sheet, click the corresponding entry on the 
list and confirm with OK./paragraph
+  bookmark branch=hid/modules/scalc/ui/whowsheetdialog/ShowSheetDialog 
xml-lang=en-US id=bm_id3149260 localize=false/paragraph role=heading 
level=2 id=hd_id3151112 l10n=U xml-lang=en-US oldref=3Hidden 
sheets/paragraph
+  paragraph l10n=U role=paragraph id=par_id3145273 xml-lang=en-US 
oldref=4ahelp hid=modules/scalc/ui/whowsheetdialog/ShowSheetDialog 
visibility=visibleDisplays a list of all hidden sheets in your spreadsheet 
document./ahelp To show a certain sheet, click the corresponding entry on the 
list and confirm with OK./paragraph
  /body
 /helpdocument
___
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' - ff/2b22bd1114187b54a8fcf70485ce70026bfaa7

 ff/2b22bd1114187b54a8fcf70485ce70026bfaa7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f620173a80ac2f794c30d7b003da5cf6a5a2014d
Author: CaolÃ¡n McNamara caol...@redhat.com
Date:   Thu Dec 19 21:00:10 2013 +

Notes added by 'git notes add'

diff --git a/ff/2b22bd1114187b54a8fcf70485ce70026bfaa7 
b/ff/2b22bd1114187b54a8fcf70485ce70026bfaa7
new file mode 100644
index 000..50148d1
--- /dev/null
+++ b/ff/2b22bd1114187b54a8fcf70485ce70026bfaa7
@@ -0,0 +1 @@
+prefer: 36270776a68c0cd0f472ebd7124c93d7936caf04
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - distro-configs/LibreOfficeWin32.conf

 distro-configs/LibreOfficeWin32.conf |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 63592dae83016ead525276a4bf42dd1fa4766ef3
Author: Michael Stahl mst...@redhat.com
Date:   Thu Dec 19 21:58:31 2013 +0100

fdo#71946: LibreOfficeWin32.conf: add --enable-ia2

Change-Id: Ib086f7e2d8537584306cb8ca174d03422cea6505

diff --git a/distro-configs/LibreOfficeWin32.conf 
b/distro-configs/LibreOfficeWin32.conf
index b04c526..580d3ca 100644
--- a/distro-configs/LibreOfficeWin32.conf
+++ b/distro-configs/LibreOfficeWin32.conf
@@ -11,6 +11,7 @@
 --enable-ext-nlpsolver
 --enable-online-update
 --enable-win-mozab-driver
+--enable-ia2
 --with-help
 --with-myspell-dicts
 --with-package-format=msi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 65675] LibreOffice 4.2 most annoying bugs

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

Bug 65675 depends on bug 71946, which changed state.

Bug 71946 Summary: ACCESSIBILITY: experimental Windows UAA to IAccessible2 
bridge AT support misconfiguration 4.2.0.1 RC1 [a11y]
https://bugs.freedesktop.org/show_bug.cgi?id=71946

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution|--- |FIXED

-- 
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

Re: Request to modify Commit #7142 about CSV import

2013-12-19 Thread Laurent BP

Thanks Eike for your fast correction :)

Laurent BP



-
LibreOffice 4.1.1.2
--
View this message in context: 
http://nabble.documentfoundation.org/Request-to-modify-Commit-7142-about-CSV-import-tp4089034p4089067.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

2013-12-19 Thread Mat M


Hello

Florian, in [1], asked for an SSH key so I can get access to the script  
machine. I sent a mail in early 11th of Dec with my public key to David O,  
Norbert, Florian and CCed Bjoern.


I don't mind having my access after holiday break, but I would like to  
have a feedback, so I don't check my mails anxiously, seeing all those  
not-so-new committers day after day :)


Regards,

Mat

Season's Greetings !

[1]  
http://nabble.documentfoundation.org/LibreOffice-Gerrit-News-for-core-on-2013-12-09-tp4087321p4087591.html

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

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

 sc/source/filter/xml/datastreamimport.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9b711d6da2f04dd7f0bd838854768bd36d353ca1
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu Dec 19 22:20:35 2013 +0100

-Werror,-Wunused-private-field

Change-Id: Ic93497426013b26fece42035272506be55d2d6a4

diff --git a/sc/source/filter/xml/datastreamimport.hxx 
b/sc/source/filter/xml/datastreamimport.hxx
index a1b675b..c77f235 100644
--- a/sc/source/filter/xml/datastreamimport.hxx
+++ b/sc/source/filter/xml/datastreamimport.hxx
@@ -20,7 +20,6 @@ class ScXMLDataStreamContext : public ScXMLImportContext
 OUString maURL;
 ScRange maRange;
 bool mbRefreshOnEmpty;
-bool mbInsertBottom;
 sc::ImportPostProcessData::DataStream::InsertPos meInsertPos;
 
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Request to modify Commit #7142 about CSV import

2013-12-19 Thread Stephan van den Akker

Laurent BP stated:
 This is a problem for all locales which uses comma as decimal separator. In
 this cases, even if .CSV files are used, the comma cannot be used as
 column separator.

Eike Rathke replied:
 Not true. The comma can still be used as separator, just the field
 values need to be enquoted if they contain a comma. Which we do.

Enquoting values may be done by LO, but lots of third party programs do not.
Dutch software often produces files with commas for decimal separators and
other characters as field separators (e.g. semicolons).

As stupid as this may seem, even software provided by the Dutch government
(like http://car.infomil.nl) works like this.

I'm afraid Calc will be rendered almost useless for Dutch users if un-enquoted
commas are treated as field separators...
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: minutes of ESC call ...

2013-12-19 Thread Cor Nouws

Michael Meeks wrote (19-12-13 21:24)
 * Pending Action Items:
 + need design for copying styles between templates (Cor Nouws/other UX?)
 cf. 
 http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01658.html
 
 http://www.mail-archive.com/libreoffice-ux-advise@lists.freedesktop.org/msg01663.html

Thanks for having that here.
It's on my wish list (= portal to a todo list) to have a clear state of
wishes etc, in this area.

Cheers,
Cor

-- 
 - Cor Nouws
 - http://nl.libreoffice.org
 - The Document Foundation Membership Committee Member
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Changes to 'private/kohei/4-2-data-stream-staging'

New branch 'private/kohei/4-2-data-stream-staging' available with the following 
commits:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac ios/experimental ios/lo.xcconfig.in

 configure.ac | 
   7 +++
 ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj | 
   1 -
 ios/lo.xcconfig.in   | 
   1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 969bd8aa731935566a65c5e207ece6eb523df24e
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Dec 19 23:22:04 2013 +0200

Use embedded DWARF in the iOS apps except for in release build

Running dsymutil takes much too long to be bearable during
development. But when building for actual release we do want a
separate dSYM of course. (Of course none of the current iOS apps in
the source are intended to be actually released. But add this logic
just for completeness.)

Change-Id: Ibb5037d6926e969a891269d6c9d86232bc01cb3c

diff --git a/configure.ac b/configure.ac
index 1734796..b0a3d6a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3865,6 +3865,13 @@ else
 fi
 AC_SUBST(ENABLE_SYMBOLS)
 
+# Running dsymutil takes too long
+XCODE_DEBUG_INFORMATION_FORMAT=dwarf-with-dsym
+if test $enable_release_build != yes -a \( -n $ENABLE_SYMBOLS -o -n 
$ENABLE_DEBUG -o -n $ENABLE_DBGUTIL \); then
+XCODE_DEBUG_INFORMATION_FORMAT=dwarf
+fi
+AC_SUBST(XCODE_DEBUG_INFORMATION_FORMAT)
+
 # Check for explicit A/C/CXX/OBJC/OBJCXX/LDFLAGS.
 # By default use the ones specified by our build system,
 # but explicit override is possible.
diff --git 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
index 0f7ad53..f236daf 100644
--- 
a/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
+++ 
b/ios/experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj/project.pbxproj
@@ -370,7 +370,6 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
CODE_SIGN_IDENTITY[sdk=iphoneos*] = iPhone 
Developer;
COPY_PHASE_STRIP = NO;
-   DEBUG_INFORMATION_FORMAT = dwarf;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in
index 3f654ed..60e228e 100644
--- a/ios/lo.xcconfig.in
+++ b/ios/lo.xcconfig.in
@@ -22,6 +22,7 @@ LO_WORKDIR = @WORKDIR@
 // what they will be used for.
 ARCHS = @XCODE_ARCHS@
 CLANG_CXX_LIBRARY = @XCODE_CLANG_CXX_LIBRARY@
+DEBUG_INFORMATION_FORMAT=@XCODE_DEBUG_INFORMATION_FORMAT@
 
 // These settings are edited in CustomTarget_Lo_Xcconfig.mk.
 LINK_LDFLAGS =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [PATCH] HiDPI fixes for squiggly underlines

2013-12-19 Thread Keith Curtis

HI Kendy,

Thank you! I've pulled your diff and doing a rebuild now. I have found that
5 pixels is a good value on my machine but I'll try 6, and it needs to be
shifted down one more pixel. Also, there may be dirt because it increases
the waveheight after the check. I believe Linux will return 96 dpi, but I
will check all this and improve as necessary, code against the new OutDev
value, and submit an initial set of fixes to Gerrit. The toolbar work was
being handled by Andrzej so I'll work on the other aspects. I've focused on
Writer, because that is what I use the most, but many of the changes help
all the apps and I've done some work in Calc and Impress also. I've made
one fix in the Sidebar, but it needs a few hours by someone who knows the
code, or a few days by someone who doesn't.

It would be great to get this in somehow as things are much prettier
already. I do this work because it is fun and easy, but there isn't much
value in icons and controls too small to easily recognize or click on.

Regards,

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

[Libreoffice-commits] core.git: 2 commits - dbaccess/util extensions/source framework/source framework/util include/sal postprocess/CppunitTest_services.mk postprocess/qa