[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

--- Comment #217 from Luke  ---
Nominated bug 75209 since it represents a major loss of functionality in
impress 4.2+, only noticeable when viewing sideshow.

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

[bugzilla-daemon]

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

Luke  changed:

   What|Removed |Added

 Depends on||75209

-- 
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: basctl/source include/svtools include/svx include/vcl sfx2/source svtools/source svx/source toolkit/inc toolkit/source vcl/source

[Stephan Bergmann]

 basctl/source/basicide/baside2.hxx |2 +-
 basctl/source/basicide/baside2b.cxx|2 +-
 include/svtools/headbar.hxx|2 +-
 include/svtools/svmedit.hxx|2 +-
 include/svtools/toolpanel/paneltabbar.hxx  |2 +-
 include/svtools/toolpanel/toolpaneldeck.hxx|2 +-
 include/svx/srchdlg.hxx|2 +-
 include/vcl/unowrap.hxx|4 ++--
 include/vcl/window.hxx |2 +-
 sfx2/source/sidebar/AccessibleTitleBar.cxx |2 +-
 svtools/source/control/headbar.cxx |2 +-
 svtools/source/edit/svmedit.cxx|2 +-
 svtools/source/toolpanel/paneltabbar.cxx   |4 ++--
 svtools/source/toolpanel/toolpaneldeck.cxx |4 ++--
 svtools/source/toolpanel/toolpaneldrawer.cxx   |4 ++--
 svtools/source/toolpanel/toolpaneldrawer.hxx   |2 +-
 svtools/source/uno/wizard/wizardpagecontroller.cxx |2 +-
 svx/source/dialog/srchdlg.cxx  |2 +-
 toolkit/inc/helper/unowrapper.hxx  |4 ++--
 toolkit/source/awt/vclxcontainer.cxx   |2 +-
 toolkit/source/awt/vclxtoolkit.cxx |6 +++---
 toolkit/source/awt/vclxwindow.cxx  |2 +-
 toolkit/source/controls/unocontrol.cxx |2 +-
 toolkit/source/helper/unowrapper.cxx   |   10 +-
 toolkit/source/helper/vclunohelper.cxx |2 +-
 vcl/source/window/accessibility.cxx|2 +-
 vcl/source/window/window.cxx   |2 +-
 27 files changed, 38 insertions(+), 38 deletions(-)

New commits:
commit 7af850c89664d3c739abd244cb7016b806c0f293
Author: Stephan Bergmann 
Date:   Wed Sep 10 08:35:26 2014 +0200

vcl: sal_Bool -> bool

Change-Id: Iff4da6d6281eb9194db348ebc10fbe7718538401

diff --git a/basctl/source/basicide/baside2.hxx 
b/basctl/source/basicide/baside2.hxx
index 72af6c7..02ce15c 100644
--- a/basctl/source/basicide/baside2.hxx
+++ b/basctl/source/basicide/baside2.hxx
@@ -116,7 +116,7 @@ private:
 
 virtual
 ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer >
-GetComponentInterface(sal_Bool bCreate = true) SAL_OVERRIDE;
+GetComponentInterface(bool bCreate = true) SAL_OVERRIDE;
 CodeCompleteDataCache aCodeCompleteCache;
 boost::scoped_ptr< CodeCompleteWindow > pCodeCompleteWnd;
 OUString GetActualSubName( sal_uLong nLine ); // gets the actual 
subroutine name according to line number
diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 9d53af5..2fadb71 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2094,7 +2094,7 @@ void ComplexEditorWindow::SetLineNumberDisplay(bool b)
 }
 
 uno::Reference< awt::XWindowPeer >
-EditorWindow::GetComponentInterface(sal_Bool bCreate)
+EditorWindow::GetComponentInterface(bool bCreate)
 {
 uno::Reference< awt::XWindowPeer > xPeer(
 Window::GetComponentInterface(false));
diff --git a/include/svtools/headbar.hxx b/include/svtools/headbar.hxx
index ce4d50b..63fb5e9 100644
--- a/include/svtools/headbar.hxx
+++ b/include/svtools/headbar.hxx
@@ -372,7 +372,7 @@ public:
 virtual ::com::sun::star::uno::Reference<
 ::com::sun::star::accessibility::XAccessible >  CreateAccessible() 
SAL_OVERRIDE;
 void SetAccessible( ::com::sun::star::uno::Reference< 
::com::sun::star::accessibility::XAccessible > );
-virtual ::com::sun::star::uno::Reference< 
::com::sun::star::awt::XWindowPeer > GetComponentInterface( sal_Bool bCreate ) 
SAL_OVERRIDE;
+virtual ::com::sun::star::uno::Reference< 
::com::sun::star::awt::XWindowPeer > GetComponentInterface( bool bCreate ) 
SAL_OVERRIDE;
 
 };
 
diff --git a/include/svtools/svmedit.hxx b/include/svtools/svmedit.hxx
index 0970e38..892d80f 100644
--- a/include/svtools/svmedit.hxx
+++ b/include/svtools/svmedit.hxx
@@ -34,7 +34,7 @@ public:
 MultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER );
 
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::awt::XWindowPeer >
-GetComponentInterface(sal_Bool bCreate = sal_True) SAL_OVERRIDE;
+GetComponentInterface(bool bCreate = true) SAL_OVERRIDE;
 };
 
 
diff --git a/include/svtools/toolpanel/paneltabbar.hxx 
b/include/svtools/toolpanel/paneltabbar.hxx
index 3f1d36c..190b86b 100644
--- a/include/svtools/toolpanel/paneltabbar.hxx
+++ b/include/svtools/toolpanel/paneltabbar.hxx
@@ -81,7 +81,7 @@ namespace svt
 virtual voidDataChanged( const DataChangedEvent& 
i_rDataChanedEvent ) SAL_OVERRIDE;
 
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::awt::XWindowPeer >
-GetComponentInterface( sal_Bool i_bCreate ) 
SAL_OVERRIDE;
+GetComponentInterface( bool i_bCreate ) SAL_OVERRI

LibreOffice Gerrit News for core on 2014-09-10

[gerrit]

Moin!

* Open changes on master for project core changed in the last 25 hours:

 First time contributors doing great things! 
+ fdo#39468: Translated German to English
  in https://gerrit.libreoffice.org/11373 from Jennifer Liebel
  about module forms, include
+ mediawiki: use String.length()==0 instead of String.equals(empty string)
  in https://gerrit.libreoffice.org/11372 from Robert Antoni Buj i Gelonch
  about module swext
+ mediawiki: use a character literal
  in https://gerrit.libreoffice.org/11371 from Robert Antoni Buj i Gelonch
  about module swext
+ Add debug documents to SwDBManager::MergeMailFiles
  in https://gerrit.libreoffice.org/10970 from Jan-Marek Glogowski
  about module sw
+ Add debug messages for sw.{createcopy,docappend}
  in https://gerrit.libreoffice.org/10969 from Jan-Marek Glogowski
  about module sw
+ qadevOOo: Convert a primitive type into a string
  in https://gerrit.libreoffice.org/11370 from Robert Antoni Buj i Gelonch
  about module qadevOOo
+ qadevOOo: Number Parsing
  in https://gerrit.libreoffice.org/11369 from Robert Antoni Buj i Gelonch
  about module qadevOOo
+ qadevOOo: use String.length()==0 instead of String.equals(empty string)
  in https://gerrit.libreoffice.org/11368 from Robert Antoni Buj i Gelonch
  about module qadevOOo
+ qadevOOo: use a character literal
  in https://gerrit.libreoffice.org/11367 from Robert Antoni Buj i Gelonch
  about module qadevOOo
+ xmerge: Convert a primitive type into a string
  in https://gerrit.libreoffice.org/11366 from Robert Antoni Buj i Gelonch
  about module xmerge
+ fdo#55380 replaced use of obsolete interfaces
  in https://gerrit.libreoffice.org/11256 from Daniel Sikeler
  about module desktop, extensions, filter, sfx2, ucb
+ bean: Boolean Parsing
  in https://gerrit.libreoffice.org/11364 from Robert Antoni Buj i Gelonch
  about module bean
+ MM: introduce SwDoc::Append helper function
  in https://gerrit.libreoffice.org/10967 from Jan-Marek Glogowski
  about module sw
+ wizards: Number Parsing
  in https://gerrit.libreoffice.org/11359 from Robert Antoni Buj i Gelonch
  about module wizards
+ qadevOOo: use System.arraycopy
  in https://gerrit.libreoffice.org/11355 from Robert Antoni Buj i Gelonch
  about module qadevOOo
+ scripting: fix array copy and, use System.arraycopy
  in https://gerrit.libreoffice.org/11354 from Robert Antoni Buj i Gelonch
  about module scripting
+ l10ntools/source/export.cxx: be more std::
  in https://gerrit.libreoffice.org/11320 from Douglas Mencken
  about module l10ntools
 End of freshness 

+ create a master document template type
  in https://gerrit.libreoffice.org/11350 from Caolán McNamara
  about module bin, comphelper, extensions, filter, include, officecfg, 
package, scp2, sfx2, solenv, sot, sw, sysui


* Merged changes on master for project core changed in the last 25 hours:

+ editeng: avoid autocorrect crash
  in https://gerrit.libreoffice.org/11344 from Michael Stahl
+ javaunohelper: fix some misspellings
  in https://gerrit.libreoffice.org/11363 from Robert Antoni Buj i Gelonch
+ MM: always copy the internal document
  in https://gerrit.libreoffice.org/10966 from Jan-Marek Glogowski
+ MM: fix workaround for single paragraph docs
  in https://gerrit.libreoffice.org/10964 from Jan-Marek Glogowski
+ fdo#39468: Translatet some german comments
  in https://gerrit.libreoffice.org/11347 from Daniel Sikeler
+ toolkit: use String.length()==0 instead of String.equals(empty string)
  in https://gerrit.libreoffice.org/11365 from Robert Antoni Buj i Gelonch
+ wizards: use a character literal
  in https://gerrit.libreoffice.org/11360 from Robert Antoni Buj i Gelonch
+ xmerge: use String.length()==0 instead of String.equals(empty string)
  in https://gerrit.libreoffice.org/11358 from Robert Antoni Buj i Gelonch
+ xmerge: use a character literal
  in https://gerrit.libreoffice.org/11357 from Robert Antoni Buj i Gelonch
+ fdo#82854 extended unit-tests
  in https://gerrit.libreoffice.org/11348 from Michael Jaumann
+ l10ntools/source/export.cxx: add sanity check to aOutput.mSimple
  in https://gerrit.libreoffice.org/11321 from Douglas Mencken
+ configure.ac: fix error message when md5sum is missing
  in https://gerrit.libreoffice.org/11341 from Boris Egorov
+ Replace the whole content for copied documents
  in https://gerrit.libreoffice.org/10963 from Jan-Marek Glogowski
+ fdo#75757: remove inheritance to std::vector
  in https://gerrit.libreoffice.org/11349 from Takeshi Abe
+ fdo#82994: Changed filterlabel of .ac3-files
  in https://gerrit.libreoffice.org/11351 from Daniel Sikeler
+ fdo#45071 Remove Libreoffice browser plugin
  in https://gerrit.libreoffice.org/10757 from Bryan Quigley
+ fdo#82496: Change picture option by rightclicking
  in https://gerrit.libreoffice.org/11332 from Jennifer Liebel
+ fdo#83428 Add test case for custom property dropped in docx
  in https://gerrit.libreoffice.org/11346 from Heena Gupta
+ semibold -> bold in Color Picker headings
  in https://gerrit.libreof

Re: Performance samples for LibreOffice ...

[Jan Hubicka]

> 
> Here's the struct:
> 
> struct NDXHeader
> {
> sal_uInt32  db_rootpage;/* Rootpage position  
>   */
> sal_uInt32  db_pagecount;   /* Page count 
>   */
> sal_uInt8   db_frei[4]; /* Reserved   
>   */
> sal_uInt16  db_keylen;  /* Key length 
>   */
> sal_uInt16  db_maxkeys; /* Maximum number of keys per 
> page  */
> sal_uInt16  db_keytype; /* Type of key:
>0 = Text
>1 = Numerical  
>   */
> sal_uInt16  db_keyrec;  /* Length of an index record
>RecordNumber + keylen  
>   */
> sal_uInt8   db_frei1[3];/* Reserved   
>   */
> sal_uInt8   db_unique;  /* Unique 
>   */
> chardb_name[488];   /* index_name (field name)
>   */
> };
> 
> sal_uIntXX are LibreOffice internal #define for the unsigned integer
> type of size XX bits. I find it rather unlikely they would differ
> across the LibreOffice codebase; if they do, we have a "bigger"
> problem.
> 
> What do you think about this conjecture: maybe gcc compiles the
> structure with different alignment in different contexts? (Possibly
> because the LibreOffice build system forces it to with compiler flags?)

I have seen similar problem of warning in betwen units because one was compiled
with -fsigned-char and other with -funsigned-char (in Firefox). I think 
compiler is
valid to warn here about ODR violation since those flags are ABI breaking flags.

It is also possible it is compare bug in the new ODR checking code - but I do 
not
really see how it could get confused in such a rather simple structure.

> 
> > Currently GCC report just topelvel type difference, I have patch for
> > the ODR merging that reports the inner type too. I will try to
> > update it for mainline today or tomorrow and get back to you.
> 
> Great, thanks. I'm waiting for the result with great curiosity.

Yep, I am curious too.  I just got my trees updated after vacation so hopefully
I will get there soon (for sure libreoffice will trigger few GCC bugs first)

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

Re: Performance samples for LibreOffice ...

[Lionel Elie Mamane]

On Wed, Sep 10, 2014 at 01:20:28AM +0200, Jan Hubicka wrote:
> > On Fri, Aug 22, 2014 at 09:06:24PM +0200, Jan Hubicka wrote:
> > 
> > > Another one I noticed :)
> > > /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:41:15: 
> > > warning: type �struct ODbaseIndex� violates one definition rule [-Wodr]
> > >  class ODbaseIndex : public ODbaseIndex_BASE
> > >^
> > > /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:41:15: 
> > > note: a different type is defined in another translation unit
> > >  class ODbaseIndex : public ODbaseIndex_BASE
> > >^
> > > /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:74:29: 
> > > note: the first difference of corresponding definitions is field 
> > > �m_aHeader�
> > >  NDXHeader   m_aHeader;
> > >  ^
> > > /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:74:29: 
> > > note: a field of same name but different type is defined in another 
> > > translation unit
> > >  NDXHeader   m_aHeader;
> > >  ^
> > > /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:55:20: 
> > > note: type �struct NDXHeader� should match type �struct NDXHeader�
> > >  struct NDXHeader
> > > ^
> > > /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:55:20: 
> > > note: the incompatible type is defined here
> > >  struct NDXHeader
> > > 
> > > Thisone will be harder to track - I can get better diagnostic with ODR 
> > > merging patch once I get around updating it for mainline
> > 
> > This looks like it is saying that there are two different
> > (incompatible) definitions of type
> > connectivity::dbase::ODbaseIndex::NDXHeader, but "git grep NDXHeader"
> > finds only one.
> > 
> > Care to explain the problem? Thanks.
> 
> The problem here will be most probably cause by difference in one of types 
> NDXHeader is built from.
> (or by #define somewhere earlier that makes it to diverge)

Here's the struct:

struct NDXHeader
{
sal_uInt32  db_rootpage;/* Rootpage position
*/
sal_uInt32  db_pagecount;   /* Page count   
*/
sal_uInt8   db_frei[4]; /* Reserved 
*/
sal_uInt16  db_keylen;  /* Key length   
*/
sal_uInt16  db_maxkeys; /* Maximum number of keys per 
page  */
sal_uInt16  db_keytype; /* Type of key:
   0 = Text
   1 = Numerical
*/
sal_uInt16  db_keyrec;  /* Length of an index record
   RecordNumber + keylen
*/
sal_uInt8   db_frei1[3];/* Reserved 
*/
sal_uInt8   db_unique;  /* Unique   
*/
chardb_name[488];   /* index_name (field name)  
*/
};

sal_uIntXX are LibreOffice internal #define for the unsigned integer
type of size XX bits. I find it rather unlikely they would differ
across the LibreOffice codebase; if they do, we have a "bigger"
problem.

What do you think about this conjecture: maybe gcc compiles the
structure with different alignment in different contexts? (Possibly
because the LibreOffice build system forces it to with compiler flags?)

> Currently GCC report just topelvel type difference, I have patch for
> the ODR merging that reports the inner type too. I will try to
> update it for mainline today or tomorrow and get back to you.

Great, thanks. I'm waiting for the result with great curiosity.

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

Re: Performance samples for LibreOffice ...

[Jan Hubicka]

Hello,
I finally had chance to put the data together:
http://hubicka.blogspot.ca/2014/09/linktime-optimization-in-gcc-part-3.html
any comments are welcome.

> On Fri, Aug 22, 2014 at 09:06:24PM +0200, Jan Hubicka wrote:
> 
> > Another one I noticed :)
> > /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:41:15: 
> > warning: type �struct ODbaseIndex� violates one definition rule [-Wodr]
> >  class ODbaseIndex : public ODbaseIndex_BASE
> >^
> > /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:41:15: 
> > note: a different type is defined in another translation unit
> >  class ODbaseIndex : public ODbaseIndex_BASE
> >^
> > /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:74:29: 
> > note: the first difference of corresponding definitions is field �m_aHeader�
> >  NDXHeader   m_aHeader;
> >  ^
> > /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:74:29: 
> > note: a field of same name but different type is defined in another 
> > translation unit
> >  NDXHeader   m_aHeader;
> >  ^
> > /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:55:20: 
> > note: type �struct NDXHeader� should match type �struct NDXHeader�
> >  struct NDXHeader
> > ^
> > /aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:55:20: 
> > note: the incompatible type is defined here
> >  struct NDXHeader
> > 
> > Thisone will be harder to track - I can get better diagnostic with ODR 
> > merging patch once I get around updating it for mainline
> 
> This looks like it is saying that there are two different
> (incompatible) definitions of type
> connectivity::dbase::ODbaseIndex::NDXHeader, but "git grep NDXHeader"
> finds only one.
> 
> Care to explain the problem? Thanks.

The problem here will be most probably cause by difference in one of types 
NDXHeader is built from.
(or by #define somewhere earlier that makes it to diverge)

Currently GCC report just topelvel type difference, I have patch for the ODR 
merging that reports
the inner type too. I will try to update it for mainline today or tomorrow and 
get back to you.

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

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

[Adam Co]

 include/oox/export/utils.hxx  |
4 
 oox/source/drawingml/lineproperties.cxx   |   
15 +-
 oox/source/drawingml/linepropertiescontext.cxx|   
46 +++
 oox/source/export/drawingml.cxx   |   
49 +--
 sw/qa/extras/ooxmlexport/data/dashed_line_custdash_1000th_of_percent.docx 
|binary
 sw/qa/extras/ooxmlexport/data/dashed_line_custdash_percentage.docx
|binary
 sw/qa/extras/ooxmlexport/data/dashed_line_preset.docx 
|binary
 sw/qa/extras/ooxmlexport/ooxmlsdrexport.cxx   |   
62 ++
 8 files changed, 156 insertions(+), 20 deletions(-)

New commits:
commit 1af3d8a211852da5a1f130aa22e00ab329301ee7
Author: Adam Co 
Date:   Sun Jun 8 16:35:32 2014 +0300

Rewrite import and export of custom dashes in ooxml filter (fix)

The import mechanism of custom-dash (a:custDash) was wrong, and imported
wrong values, which causes that if you would import-export-import-export -
you would get inflated values, which might cause a corruption.

The attributes for custom-dash nodes (a:ds) are of type 
'PositivePercentage'.
Office will read percentages formatted with a trailing percent sign or
formatted as 1000th of a percent without a trailing percent sign, but only
write percentages as 1000th's of a percent without a trailing percent sign.

During import - LO did not check if it was in '%' format or in
'1000th of a percent' format. So that was fixed. Also - when exporting -
it always exports now in '1000th of a percent' format.

Reviewed-on: https://gerrit.libreoffice.org/9681
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 
(cherry picked from commit 2211a67cc5e577f8abdcc96c9c63865be5fb988d)

Conflicts:
oox/source/export/drawingml.cxx

Change-Id: I6bd74df26951974f85173227c832386c70034afb

diff --git a/include/oox/export/utils.hxx b/include/oox/export/utils.hxx
index 588d231..2c4fcec 100644
--- a/include/oox/export/utils.hxx
+++ b/include/oox/export/utils.hxx
@@ -50,9 +50,9 @@ static inline sal_Int64 TwipsToEMU( sal_Int32 nTwips )
 }
 
 template 
-OString writePercentage(T number)
+OString write1000thOfAPercent(T number)
 {
-return OString::number(number) + "%";
+return OString::number( number * 1000 );
 }
 
 #endif
diff --git a/oox/source/drawingml/lineproperties.cxx 
b/oox/source/drawingml/lineproperties.cxx
index 2044095..372740b 100644
--- a/oox/source/drawingml/lineproperties.cxx
+++ b/oox/source/drawingml/lineproperties.cxx
@@ -107,19 +107,26 @@ void lclConvertCustomDash( LineDash& orLineDash, const 
LineProperties::DashStopV
 sal_Int16 nDashes = 0;
 sal_Int32 nDashLen = 0;
 sal_Int32 nDistance = 0;
+sal_Int32 nConvertedLen = 0;
+sal_Int32 nConvertedDistance = 0;
 for( LineProperties::DashStopVector::const_iterator aIt = 
rCustomDash.begin(), aEnd = rCustomDash.end(); aIt != aEnd; ++aIt )
 {
-if( aIt->first <= 2 )
+// Get from "1000th of percent" ==> percent ==> multiplier
+nConvertedLen  = aIt->first  / 1000 / 100;
+nConvertedDistance = aIt->second / 1000 / 100;
+
+// Check if it is a dot (100% = dot)
+if( nConvertedLen == 1 )
 {
 ++nDots;
-nDotLen += aIt->first;
+nDotLen += nConvertedLen;
 }
 else
 {
 ++nDashes;
-nDashLen += aIt->first;
+nDashLen += nConvertedLen;
 }
-nDistance += aIt->second;
+nDistance += nConvertedDistance;
 }
 orLineDash.DotLen = (nDots > 0) ? ::std::max< sal_Int32 >( nDotLen / 
nDots, 1 ) : 0;
 orLineDash.Dots = nDots;
diff --git a/oox/source/drawingml/linepropertiescontext.cxx 
b/oox/source/drawingml/linepropertiescontext.cxx
index 3195e56..ee49fba 100644
--- a/oox/source/drawingml/linepropertiescontext.cxx
+++ b/oox/source/drawingml/linepropertiescontext.cxx
@@ -66,8 +66,50 @@ ContextHandlerRef LinePropertiesContext::onCreateContext( 
sal_Int32 nElement, co
 return this;
 break;
 case A_TOKEN( ds ):
-mrLineProperties.maCustomDash.push_back( LineProperties::DashStop(
-rAttribs.getInteger( XML_d, 0 ), rAttribs.getInteger( XML_sp, 
0 ) ) );
+{
+// 'a:ds' has 2 attributes : 'd' and 'sp'
+// both are of type 'a:ST_PositivePercentage'
+// according to the specs Office will read percentages formatted 
with a trailing percent sign
+// or formatted as 1000th of a percent without a trailing percent 
sign, but only write percentages
+// as 1000th's of a percent without a trailing percent sign.
+// The code below takes care of both scenarios by converting to 
'1000th of a percent' always
+OUString aStr;
+sal_Int32 nDash 

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

[Matúš Kukan]

 include/oox/drawingml/shape.hxx|1 +
 oox/source/drawingml/table/tablebackgroundstylecontext.cxx |1 -
 oox/source/drawingml/table/tablecell.cxx   |9 ++---
 3 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit e2723d00b77dc1044e2ba599ba93517af34e1ea5
Author: Matúš Kukan 
Date:   Tue Sep 9 22:56:23 2014 +0200

Better place to initialize mnThemedIdx

To make 'if (rBackgroundFillStyle.mnThemedIdx != 0)' actually work
as intended. Avoids invalid call to pTheme->getFillStyle() which
is not supposed to return 0 here.

Change-Id: I323e2628cba64167240e8f0b945e6693b47b8e77

diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 5882dad..a3bd884 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -50,6 +50,7 @@ struct ShapeStyleRef
 {
 Color   maPhClr;
 sal_Int32   mnThemedIdx;
+ShapeStyleRef() : mnThemedIdx(0) {}
 };
 
 typedef ::std::map< sal_Int32, ShapeStyleRef > ShapeStyleRefMap;
diff --git a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx 
b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
index 4e4cf3c..a91da19 100644
--- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
+++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
@@ -34,7 +34,6 @@ TableBackgroundStyleContext::TableBackgroundStyleContext( 
ContextHandler2Helper&
 : ContextHandler2( rParent )
 , mrTableStyle( rTableStyle )
 {
-mrTableStyle.getBackgroundFillStyleRef().mnThemedIdx = 0;
 }
 
 TableBackgroundStyleContext::~TableBackgroundStyleContext()
diff --git a/oox/source/drawingml/table/tablecell.cxx 
b/oox/source/drawingml/table/tablecell.cxx
index dfca833..817caba 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -362,13 +362,8 @@ void TableCell::pushToXCell( const 
::oox::core::XmlFilterBase& rFilterBase, ::oo
 {
 if (const Theme* pTheme = rFilterBase.getCurrentTheme())
 {
-FillProperties const*const pStyle(
-pTheme->getFillStyle(rBackgroundFillStyle.mnThemedIdx));
-if (pStyle)
-{
-aBgColor = pStyle->getBestSolidColor();
-nPhClr = 
rBackgroundFillStyle.maPhClr.getColor(rFilterBase.getGraphicHelper());
-}
+aBgColor = 
pTheme->getFillStyle(rBackgroundFillStyle.mnThemedIdx)->getBestSolidColor();
+nPhClr = 
rBackgroundFillStyle.maPhClr.getColor(rFilterBase.getGraphicHelper());
 }
 }
 if (aBgColor.isUsed())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

[bugzilla-daemon]

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

Terrence Enger  changed:

   What|Removed |Added

 Depends on||83633

--- Comment #10 from Terrence Enger  ---
Adding bug 83633 "FILESAVE: Crash when save in ODF 1.0/1.1".  It is aa
crash and a regression (introduced around 2014-07-02).

-- 
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: editeng/source

[Michael Stahl]

 editeng/source/misc/svxacorr.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 2ce8b2c37aaebacdce250d6758d93ce7f9a992f0
Author: Michael Stahl 
Date:   Sun Aug 31 22:06:15 2014 +0200

editeng: avoid autocorrect crash

Happened for me with nFndPos = 30 and nEndPos = 20, and a rTxt that
probably contained "->" twice.

Change-Id: I534c60a5904249e25fdefe45639b4512e6f138c5
Reviewed-on: https://gerrit.libreoffice.org/11344
Reviewed-by: Németh László 
Tested-by: Michael Stahl 

diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index 04e079b..f22cb42 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -2833,6 +2833,10 @@ const SvxAutocorrWord* 
SvxAutocorrWordList::WordMatches(const SvxAutocorrWord *p
 ;
 if (bWasWordDelim) nFndPos++;
 }
+if (nEndPos + extra_repl <= nFndPos)
+{
+return 0;
+}
 // store matching pattern and its replacement as a new list 
item, eg. "i18ns" -> "internationalizations"
 OUString aShort = rTxt.copy(nFndPos, nEndPos - nFndPos + 
extra_repl);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - writerfilter/source

[sushil_shinde]

 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   34 ++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |1 
 2 files changed, 24 insertions(+), 11 deletions(-)

New commits:
commit 3c03c0af168dd0fec4827b8d6b0761f7ca2f80c7
Author: sushil_shinde 
Date:   Thu Jun 26 15:40:05 2014 +0530

fdo#77129 DOCX:Only Six pages were loaded out of 60 pages.

   - Footer reference was inside TOC field.
   - m_bStartTOC flag was enabled while handling TOC from document.
   - Since m_bStartTOC was enabled while importing footer it was inserting 
extra textcursors entries
 to m_aTextAppendStack.
   - Due to bad entries in textappendstack, footer was not popped properly.
   - Because of this all lost data after sixth page was inserted into 
footer node and it was not
 visible on page.
   - Added new flag to differentiate TOC from main document and Header or 
Footer.

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
Reviewed on:
https://gerrit.libreoffice.org/9930

(cherry picked from commit 9948d9566e86b190e74a62e63f273f5fa0eb8929)
Signed-off-by: Luboš Luňák 

Conflicts:
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
writerfilter/source/dmapper/DomainMapper_Impl.cxx

Change-Id: I5288f5c313c890e0fdddf3c60c4609eab30edde6

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 4e9a6f1..47f3a41 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -155,6 +155,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bIsColumnBreakDeferred( false ),
 m_bIsPageBreakDeferred( false ),
 m_bStartTOC(false),
+m_bStartTOCHeaderFooter(false),
 m_bStartedTOC(false),
 m_bTOCPageRef(false),
 m_nSymboldata(-1),
@@ -1316,22 +1317,29 @@ void DomainMapper_Impl::appendTextPortion( const 
OUString& rString, PropertyMapP
 {
 if (m_bStartTOC)
 {
-m_bStartedTOC = true;
-uno::Reference< text::XTextCursor > xTOCTextCursor;
-xTOCTextCursor = xTextAppend->getEnd()->getText( 
)->createTextCursor( );
-xTOCTextCursor->gotoEnd(false);
-if (xTOCTextCursor.is())
+if(m_bInHeaderFooterImport && !m_bStartTOCHeaderFooter)
 {
-xTextRange = xTextAppend->insertTextPortion(rString, 
pValues, xTOCTextCursor);
-xTOCTextCursor->gotoRange(xTextRange->getEnd(), true);
+xTextRange = xTextAppend->appendTextPortion(rString, 
pValues);
 }
 else
 {
-xTextRange = xTextAppend->appendTextPortion(rString, 
pValues);
-xTOCTextCursor = xTextAppend->createTextCursor();
-xTOCTextCursor->gotoRange(xTextRange->getEnd(), false);
+m_bStartedTOC = true;
+uno::Reference< text::XTextCursor > xTOCTextCursor;
+xTOCTextCursor = xTextAppend->getEnd()->getText( 
)->createTextCursor( );
+xTOCTextCursor->gotoEnd(false);
+if (xTOCTextCursor.is())
+{
+xTextRange = 
xTextAppend->insertTextPortion(rString, pValues, xTOCTextCursor);
+xTOCTextCursor->gotoRange(xTextRange->getEnd(), 
true);
+}
+else
+{
+xTextRange = 
xTextAppend->appendTextPortion(rString, pValues);
+xTOCTextCursor = xTextAppend->createTextCursor();
+xTOCTextCursor->gotoRange(xTextRange->getEnd(), 
false);
+}
+m_aTextAppendStack.push(TextAppendContext(xTextAppend, 
xTOCTextCursor));
 }
-m_aTextAppendStack.push(TextAppendContext(xTextAppend, 
xTOCTextCursor));
 }
 else
 xTextRange = xTextAppend->appendTextPortion(rString, 
pValues);
@@ -2885,6 +2893,8 @@ void DomainMapper_Impl::handleToc
 {
 OUString sValue;
 m_bStartTOC = true;
+if(m_bInHeaderFooterImport)
+m_bStartTOCHeaderFooter = true;
 bool bTableOfFigures = false;
 bool bHyperlinks = false;
 bool bFromOutline = false;
@@ -3839,6 +3849,8 @@ void DomainMapper_Impl::PopFieldContext()
 xTOCMarkerCursor->goLeft(1,sal_True);
 xTOCMarkerCursor->setString(OUString());
 }
+if(m_bInHeaderFooterImport && m_bStartTOCHeaderFooter)
+m_bStartTOCHeaderFooter = false;

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - extensions.lst

[Andrea Pescetti]

 extensions.lst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 638e87e8d09a5f08a925b395710ad1e2cd310ef4
Author: Andrea Pescetti 
Date:   Tue Sep 9 19:47:56 2014 +

#i125581# Update English dictionary to version 2014.09.01

Patch-By: Amali Praveena Soban Kumar 

diff --git a/extensions.lst b/extensions.lst
index 48eea3a..d88fd8b9 100644
--- a/extensions.lst
+++ b/extensions.lst
@@ -39,7 +39,7 @@
 
 # English dictionary
 [ language=en.* || language=de || language=it ]
-6e6d2112a43b744fa5dc12c4b150d52a 
http://sourceforge.net/projects/aoo-extensions/files/17102/5/dict-en.oxt/download
 "dict-en.oxt"
+3ae393028c36c0b4a60041f85ce8133e 
http://sourceforge.net/projects/aoo-extensions/files/17102/6/dict-en.oxt/download
 "dict-en.oxt"
 
 # English (USA, en_US) dictionary
 [ language==nl || language==ru ]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Giuseppe Bilotta license statement

[Giuseppe Bilotta]

Hello,

I'm preparing a couple of small patches to improve detection of HiDPI
displays under Linux when not under one of the major desktop
environments. In case my contributions get accepted, this is the
license statement:

All of my contributions to LibreOffice may be licensed under the
MPLv2/LGPLv3+ dual license.

Keep up the good job,

-- 
Giuseppe "Oblomov" Bilotta
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: javaunohelper/com

[rbuj]

 javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java |2 
 javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java |4 -
 javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java|   22 
+-
 javaunohelper/com/sun/star/lib/uno/helper/WeakAdapter.java|4 -
 javaunohelper/com/sun/star/lib/uno/helper/WeakBase.java   |2 
 5 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 0d0920b13e23763ba2cc72eb48729ad2fad9d23d
Author: rbuj 
Date:   Tue Sep 9 18:45:15 2014 +0200

javaunohelper: fix some misspellings

Change-Id: Ibfa6e6ed2a4b4d3fa4b5e5cf624e42442653d358
Reviewed-on: https://gerrit.libreoffice.org/11363
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java 
b/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
index 67272bc..aa402d2 100644
--- a/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
+++ b/javaunohelper/com/sun/star/comp/helper/ComponentContextEntry.java
@@ -44,7 +44,7 @@ public class ComponentContextEntry
 @param lateInit
object factory or service string
 @param value
-   pass null (dummy separating from second ctor signature)
+   pass null (dummy separating from second constructor signature)
 */
 public ComponentContextEntry( Object lateInit, Object value )
 {
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java 
b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
index 650be99..b49b28f 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/InterfaceContainer.java
@@ -39,7 +39,7 @@ import com.sun.star.uno.UnoRuntime;
  * All methods are thread-safe. The same holds true for
  * iterators, issued by this class. Several iterators can exist at the same 
time and can also
  * be modified (java.util.ListIterator.add, java.util.ListIterator.remove 
etc.). To make this work,
- * the InterfaceContainer provides the iterators with copys of the list's data.
+ * the InterfaceContainer provides the iterators with copies of the list's 
data.
  * The add and remove calls on the iterator modify the data in the iterator's 
list as well as
  * in InterfaceContainer. Modification on InterfaceContainer, however, are not
  * synchronized with existing iterators. For example
@@ -460,7 +460,7 @@ public class InterfaceContainer implements Cloneable
 }
 
 /** The iterator keeps a copy of the list. Changes to InterfaceContainer 
do not
- *  affect the data of the iterator. Conversly, changes to the iterator 
are effect
+ *  affect the data of the iterator. Conversely, changes to the iterator 
are effect
  *  InterfaceContainer.
  */
 synchronized public ListIterator listIterator(int index)
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java 
b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
index 227dcde..c9bece6 100644
--- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
+++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java
@@ -99,7 +99,7 @@ XMultiPropertySet
  *  These methods expect id to be a String which represents the 
name of a member variable
  *  which holds the property value.
  *  Only properties which are registered can be accessed. Registration has 
to occur during
- *  initialization of the inheriting class (i.e. within the contructor).
+ *  initialization of the inheriting class (i.e. within the constructor).
  *  @param prop The property to be registered.
  *  @param id Identifies the properties storage.
  *  @see #getPropertyId
@@ -114,7 +114,7 @@ XMultiPropertySet
  *  It does the same as {@link #registerProperty(Property, Object)}. The 
first four
  *  arguments are used to construct a Property object.
  *  Registration has to occur during
- *  initialization of the inheriting class (i.e. within the contructor)
+ *  initialization of the inheriting class (i.e. within the constructor)
  *  @param name The property's name (Property.Name).
  *  @param handle The property's handle (Property.Handle).
  *  @param type The property's type (Property.Type).
@@ -133,7 +133,7 @@ XMultiPropertySet
  *  is generated and does not have to be specified here. Use this method 
for registering
  *  a property if you do not care about the Property's handles.
  *  Registration has to occur during
- *  initialization of the inheriting class (i.e. within the contructor).
+ *  initialization of the inheriting class (i.e. within the constructor).
  *  @param name The property's name (Property.Name).
  *  @param type The property's type (Property.Type).
  *  @param attributes The property's attributes (Property.Attributes).
@@ -249,8 +249,8 @@ XMultiProper

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

[Jan-Marek Glogowski]

 sw/source/uibase/dbui/dbmgr.cxx |   24 ++--
 1 file changed, 2 insertions(+), 22 deletions(-)

New commits:
commit 660349579d282bcc62f5eb8b777a78c7fadf8b1c
Author: Jan-Marek Glogowski 
Date:   Mon Jun 23 09:27:27 2014 +0200

MM: always copy the internal document

There is really no need to create the first document via UNO
createClone(), which is also slower then the internal copy.

Actually createClone also calls createCopy, but without
initializing the document.

Change-Id: I2d1ee6e12e37caf1b0d9bfa393fb4240516628e9
Reviewed-on: https://gerrit.libreoffice.org/10966
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 0b6aa6e..20bcefb 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1010,17 +1010,8 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* 
pSourceShell,
 Application::Reschedule();
 
 // The SfxObjectShell will be closed explicitly later 
but it is more safe to use SfxObjectShellLock here
-SfxObjectShellLock xWorkDocSh;
 // copy the source document
-if( 1 == nDocNo && (bAsSingleFile || 
rMergeDescriptor.bCreateSingleFile) )
-{
-uno::Reference< util::XCloneable > xClone( 
pSourceDocSh->GetModel(), uno::UNO_QUERY);
-uno::Reference< lang::XUnoTunnel > xWorkDocShell( 
xClone->createClone(), uno::UNO_QUERY);
-SwXTextDocument* pWorkModel = 
reinterpret_cast(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
-xWorkDocSh = pWorkModel->GetDocShell();
-}
-else
-xWorkDocSh = pSourceDocSh->GetDoc()->CreateCopy( 
true );
+SfxObjectShellLock xWorkDocSh = 
pSourceDocSh->GetDoc()->CreateCopy( true );
 
 {
 //create a view frame for the document
@@ -2818,18 +2809,7 @@ sal_Int32 SwDBManager::MergeDocuments( 
SwMailMergeConfigItem& rMMConfig,
 
 // copy the source document
 // the copy will be closed later, but it is more safe to use 
SfxObjectShellLock here
-SfxObjectShellLock xWorkDocSh;
-if(nDocNo == 1 )
-{
-uno::Reference< util::XCloneable > xClone( 
rSourceView.GetDocShell()->GetModel(), uno::UNO_QUERY);
-uno::Reference< lang::XUnoTunnel > xWorkDocShell( 
xClone->createClone(), uno::UNO_QUERY);
-SwXTextDocument* pWorkModel = 
reinterpret_cast(xWorkDocShell->getSomething(SwXTextDocument::getUnoTunnelId()));
-xWorkDocSh = pWorkModel->GetDocShell();
-}
-else
-{
-xWorkDocSh = 
rSourceView.GetDocShell()->GetDoc()->CreateCopy(true);
-}
+SfxObjectShellLock xWorkDocSh = 
rSourceView.GetDocShell()->GetDoc()->CreateCopy(true);
 #ifdef DBG_UTIL
 if ( nDocNo <= MAX_DOC_DUMP )
 lcl_SaveDoc( xWorkDocSh, "WorkDoc", nDocNo );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 39468] translate German comments, removing redundant ones

[bugzilla-daemon]

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

--- Comment #130 from Commit Notification 
 ---
Daniel Sikeler committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=56e103fd94fc52ca9717b3810d291c88b29c97b1

fdo#39468: Translatet some german comments



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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: include/svl

[Daniel Sikeler]

 include/svl/itemset.hxx |   23 ++-
 1 file changed, 10 insertions(+), 13 deletions(-)

New commits:
commit 56e103fd94fc52ca9717b3810d291c88b29c97b1
Author: Daniel Sikeler 
Date:   Tue Sep 9 08:45:16 2014 +0200

fdo#39468: Translatet some german comments

Change-Id: I893adbd54916c337fa23aaccb2865f56d076cdb8
Reviewed-on: https://gerrit.libreoffice.org/11347
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx
index 86e07e1..2228c43 100644
--- a/include/svl/itemset.hxx
+++ b/include/svl/itemset.hxx
@@ -41,11 +41,11 @@ class SVL_DLLPUBLIC SfxItemSet
 {
 friend class SfxItemIter;
 
-SfxItemPool*_pPool; // der verwendete Pool
-const SfxItemSet*   _pParent;   // Ableitung
-SfxItemArray_aItems;// Item-Feld
-sal_uInt16* _pWhichRanges;  // Array von 
Which-Bereichen
-sal_uInt16  _nCount;// Anzahl Items
+SfxItemPool*_pPool; // pool, which is used
+const SfxItemSet*   _pParent;   // derivation
+SfxItemArray_aItems;// field of items
+sal_uInt16* _pWhichRanges;  // array of Which Ranges
+sal_uInt16  _nCount;// number of items
 
 friend class SfxItemPoolCache;
 friend class SfxAllItemSet;
@@ -66,7 +66,6 @@ protected:
 // Notification-Callback
 virtual voidChanged( const SfxPoolItem& rOld, const 
SfxPoolItem& rNew );
 
-// direkte Put-Methode
 int PutDirect(const SfxPoolItem &rItem);
 
 public:
@@ -80,7 +79,7 @@ public:
 
 virtual SfxItemSet *Clone(bool bItems = true, SfxItemPool *pToPool 
= 0) const;
 
-// Items erfragen
+// Get number of items
 sal_uInt16  Count() const { return _nCount; }
 sal_uInt16  TotalCount() const;
 
@@ -88,10 +87,10 @@ public:
 const SfxPoolItem*  GetItem( sal_uInt16 nWhich, bool bSrchInParent 
= true,
  TypeId aItemType = 0 ) const;
 
-// Which-Wert des Items an der Position nPos erfragen
+// Get Which-value of the item at position nPos
 sal_uInt16  GetWhichByPos(sal_uInt16 nPos) const;
 
-// Item-Status erfragen
+// Get item-status
 SfxItemStateGetItemState(   sal_uInt16 nWhich,
 bool bSrchInParent = true,
 const SfxPoolItem **ppItem = 0 
) const;
@@ -107,7 +106,7 @@ public:
 
 inline void SetParent( const SfxItemSet* pNew );
 
-// Items hinzufuegen, loeschen etc.
+// add, delete items, work on items
 virtual const SfxPoolItem*  Put( const SfxPoolItem&, sal_uInt16 nWhich );
 const SfxPoolItem*  Put( const SfxPoolItem& rItem )
 { return Put(rItem, rItem.Which()); }
@@ -146,9 +145,7 @@ inline void SfxItemSet::SetParent( const SfxItemSet* pNew )
 
 class SVL_DLLPUBLIC SfxAllItemSet: public SfxItemSet
 
-/*  versteht alle Ranges; werden durch das Putten der Items
-automatisch angepasst
-*/
+//  Handles all Ranges. Ranges are automatically modified by puting items.
 
 {
 SfxVoidItem aDefault;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[rbuj]

 toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cc5eb804fc66e0bc7f0029b2665656a73f85be48
Author: rbuj 
Date:   Tue Sep 9 19:26:28 2014 +0200

toolkit: use String.length()==0 instead of String.equals(empty string)

Change-Id: Id38f28e7138460493fde982cc1ebc75c3cb0b386
Reviewed-on: https://gerrit.libreoffice.org/11365
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java 
b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
index c3c176e..b18a405 100644
--- a/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
+++ b/toolkit/qa/complex/toolkit/accessibility/_XAccessibleText.java
@@ -629,7 +629,7 @@ public class _XAccessibleText {
 System.out.println("getTextRange(0, 0): ");
 txtRange = oObj.getTextRange(0, 0);
 System.out.println(txtRange);
-locRes = txtRange.equals("");
+locRes = txtRange.length() == 0;
 res &= locRes;
 if (!locRes) {
 System.out.println("Empty string was expected");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: wizards/com

[rbuj]

 wizards/com/sun/star/wizards/common/FileAccess.java  | 
   6 +++---
 wizards/com/sun/star/wizards/form/StyleApplier.java  | 
   6 +++---
 wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java | 
   2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit baa6bb9621f604669d09ba7a7f21c16d46430194
Author: rbuj 
Date:   Tue Sep 9 16:34:41 2014 +0200

wizards: use a character literal

Change-Id: I22d530e0feb9e3112b4f2e7548d6335235713247
Reviewed-on: https://gerrit.libreoffice.org/11360
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git a/wizards/com/sun/star/wizards/common/FileAccess.java 
b/wizards/com/sun/star/wizards/common/FileAccess.java
index 12d4d4d..58af791 100644
--- a/wizards/com/sun/star/wizards/common/FileAccess.java
+++ b/wizards/com/sun/star/wizards/common/FileAccess.java
@@ -515,7 +515,7 @@ public class FileAccess
  */
 private static String getExtension(String filename)
 {
-int p = filename.indexOf(".");
+int p = filename.indexOf('.');
 if (p == -1)
 {
 return PropertyNames.EMPTY_STRING;
@@ -526,7 +526,7 @@ public class FileAccess
 {
 filename = filename.substring(p + 1);
 }
-while ((p = filename.indexOf(".")) > -1);
+while ((p = filename.indexOf('.')) > -1);
 }
 return filename;
 }
@@ -588,7 +588,7 @@ public class FileAccess
 }
 int pos = -1;
 int lastPos = 0;
-while ((pos = url.indexOf("/", pos + 1)) > -1)
+while ((pos = url.indexOf('/', pos + 1)) > -1)
 {
 lastPos = pos;
 }
diff --git a/wizards/com/sun/star/wizards/form/StyleApplier.java 
b/wizards/com/sun/star/wizards/form/StyleApplier.java
index 8236782..2cd30ff 100644
--- a/wizards/com/sun/star/wizards/form/StyleApplier.java
+++ b/wizards/com/sun/star/wizards/form/StyleApplier.java
@@ -210,17 +210,17 @@ public class StyleApplier
 if (index > -1)
 {
 String sPropName = PropertyNames.EMPTY_STRING;
-while (((sPropName.indexOf("}") < 0) && (index < _sDataList.length 
- 1)))
+while (((sPropName.indexOf('}') < 0) && (index < _sDataList.length 
- 1)))
 {
 String scurline = _sDataList[index++];
 if ((scurline.indexOf(_sPropertyDescription)) > 0)
 {
-if (scurline.indexOf(":") > 0)
+if (scurline.indexOf(':') > 0)
 {
 String[] sPropList = 
JavaTools.ArrayoutofString(scurline, ":");
 String sPropValue = sPropList[1];
 sPropValue = sPropValue.trim();
-if (sPropValue.indexOf("#") > -1)
+if (sPropValue.indexOf('#') > -1)
 {
 sPropValue = 
JavaTools.replaceSubString(sPropValue, PropertyNames.EMPTY_STRING, 
PropertyNames.SEMI_COLON);
 sPropValue = 
JavaTools.replaceSubString(sPropValue, PropertyNames.EMPTY_STRING, 
PropertyNames.SPACE);
diff --git 
a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java 
b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
index 93947e2..8c8175b 100644
--- 
a/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
+++ 
b/wizards/com/sun/star/wizards/reportbuilder/layout/ReportBuilderLayouter.java
@@ -698,7 +698,7 @@ abstract public class ReportBuilderLayouter implements 
IReportBuilderLayouter
 {
 if (_sName.startsWith("field:["))
 {
-int nCloseBrace = _sName.lastIndexOf("]");
+int nCloseBrace = _sName.lastIndexOf(']');
 return _sName.substring(7, nCloseBrace).trim();
 }
 return _sName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[rbuj]

 
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
 |2 +-
 
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b53415f168b06a0ae1dfbc73f796bb03ddd40651
Author: rbuj 
Date:   Tue Sep 9 16:22:19 2014 +0200

xmerge: use String.length()==0 instead of String.equals(empty string)

Change-Id: I41b64c2dccad41193e15b6be2e62ce9dd63e0c3a
Reviewed-on: https://gerrit.libreoffice.org/11358
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
index 434d60c..b29e89f 100644
--- 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
+++ 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentDeserializerImpl.java
@@ -105,7 +105,7 @@ public final class DocumentDeserializerImpl
 
 public Source resolve(String href, String base) throws 
TransformerException {
 if (href != null) {
-if (href.equals("javax.xml.transform.dom.DOMSource") || 
href.equals("")) {
+if (href.equals("javax.xml.transform.dom.DOMSource") || 
href.length() == 0) {
 return null;
 }
 try {
diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
index 25131cb..6c238db 100644
--- 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
+++ 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/xslt/DocumentSerializerImpl.java
@@ -200,7 +200,7 @@ public final class DocumentSerializerImpl
 public Source resolve(String href, String base)
 throws TransformerException {
 if (href != null) {
-if (href.equals("javax.xml.transform.dom.DOMSource") || 
href.equals("")) {
+if (href.equals("javax.xml.transform.dom.DOMSource") || 
href.length() == 0) {
 return null;
 }
 try {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[rbuj]

 xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java   
  |4 ++--
 
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
 |4 ++--
 
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
   |4 ++--
 
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java 
 |4 ++--
 
xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/SxcDocumentSerializer.java
 |2 +-
 xmerge/source/xmerge/java/org/openoffice/xmerge/util/OfficeUtil.java   
  |4 ++--
 6 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit c346e0faa2084e9392c1c8aaba7cf3508fdb
Author: rbuj 
Date:   Tue Sep 9 16:15:58 2014 +0200

xmerge: use a character literal

Change-Id: I99168faf1ad346f4e18495c15b5bad79fd16818f
Reviewed-on: https://gerrit.libreoffice.org/11357
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 

diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
index 41fb070..0d61b1a 100644
--- 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
+++ 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/TextStyle.java
@@ -209,9 +209,9 @@ public class TextStyle extends Style implements Cloneable {
 else if (value.startsWith("0% "))
 turnAttributesOff(SUPERSCRIPT | SUBSCRIPT);
 else {
-String firstPart = value.substring(0, value.indexOf(" "));
+String firstPart = value.substring(0, value.indexOf(' '));
 if (firstPart.endsWith("%")) {
-firstPart = firstPart.substring(0, value.indexOf("%"));
+firstPart = firstPart.substring(0, value.indexOf('%'));
 int amount;
 try {
 amount = Integer.parseInt(firstPart);
diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
index 1e319f4..48c84ef 100644
--- 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
+++ 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/CellStyle.java
@@ -170,9 +170,9 @@ public class CellStyle extends Style implements Cloneable {
 else if (value.startsWith("0% "))
 fmt.setAttribute(Format.SUPERSCRIPT | Format.SUBSCRIPT, false);
 else {
-String firstPart = value.substring(0, value.indexOf(" "));
+String firstPart = value.substring(0, value.indexOf(' '));
 if (firstPart.endsWith("%")) {
-firstPart = firstPart.substring(0, value.indexOf("%"));
+firstPart = firstPart.substring(0, value.indexOf('%'));
 int amount;
 try {
 amount = Integer.parseInt(firstPart);
diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
index d2ce990..bd33a30 100644
--- 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
+++ 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/ColumnStyle.java
@@ -129,10 +129,10 @@ public class ColumnStyle extends Style implements 
Cloneable {
 int width = 255;// Default value
 
 if(value.indexOf("cm")!=-1) {
-float widthCM = 
Float.parseFloat(value.substring(0,value.indexOf("c")));
+float widthCM = 
Float.parseFloat(value.substring(0,value.indexOf('c')));
 width = TwipsConverter.cm2twips(widthCM);
 } else if(value.indexOf("inch")!=-1) {
-float widthInch = 
Float.parseFloat(value.substring(0,value.indexOf("i")));
+float widthInch = 
Float.parseFloat(value.substring(0,value.indexOf('i')));
 width = TwipsConverter.inches2twips(widthInch);
 }
 
diff --git 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
index 343a4df9..e8cd0e0 100644
--- 
a/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
+++ 
b/xmerge/source/xmerge/java/org/openoffice/xmerge/converter/xml/sxc/RowStyle.java
@@ -128,10 +128,10 @@ public class RowStyle extends Style implements Cloneable {
 int height = 255;   // Default value
 
 if(value.indexOf("cm")!=-1) {
-float heightCM = 
Float.parseFloat(value.substring(0,value.indexOf("c")));
+float heightCM = 
Float.parseFloat(value.substring(0,value.indexOf('c')));

Re: LibreOffice / Future / design notes foo ...

[Thorsten Behrens]

Michael Meeks wrote:
>   * VCL lifecycle
>   + switching to reference counted / smart-pointer
> for all VCL Window sub-classes
>
As a random word of warning - windows point back & forth all over the
place, to both parent _and_ children; unless one uses weak pointers or
some other means of breaking cycles, this change would just exchange
crashes for leaks.

Cheers,

-- Thorsten


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

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

[Caolán McNamara]

 dbaccess/source/ui/dlg/admincontrols.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit df5c8887017fe5f5c1726211df3c48347e89e5f8
Author: Caolán McNamara 
Date:   Tue Sep 9 17:19:25 2014 +0100

Resolves: fdo#83678 no thousand seperator for port numbers

Change-Id: Ia3544c1700d71b0df63b65fe25d28cde54ad8f57

diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx 
b/dbaccess/source/ui/dlg/admincontrols.cxx
index c2b93d9..94459d8 100644
--- a/dbaccess/source/ui/dlg/admincontrols.cxx
+++ b/dbaccess/source/ui/dlg/admincontrols.cxx
@@ -137,6 +137,7 @@ namespace dbaui
 get(m_pHostName, "server");
 get(m_pPortLabel, "portlabel");
 get(m_pPort, "port");
+m_pPort->SetUseThousandSep(false);
 get(m_pDefaultPort, "defaultport");
 get(m_pSocket, "socket");
 get(m_pNamedPipe, "namedpipe");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

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

ign_christian  changed:

   What|Removed |Added

 Depends on|65070   |

-- 
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: dbaccess/uiconfig extensions/uiconfig sc/uiconfig sd/uiconfig sw/uiconfig uui/uiconfig

[Caolán McNamara]

 dbaccess/uiconfig/ui/authentificationpage.ui   |2 
 dbaccess/uiconfig/ui/autocharsetpage.ui|2 
 dbaccess/uiconfig/ui/backuppage.ui |2 
 dbaccess/uiconfig/ui/choosedatasourcedialog.ui |2 
 dbaccess/uiconfig/ui/connectionpage.ui |6 +-
 dbaccess/uiconfig/ui/dbasepage.ui  |4 -
 dbaccess/uiconfig/ui/dbwizconnectionpage.ui|2 
 dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui  |4 -
 dbaccess/uiconfig/ui/jdbcconnectionpage.ui |2 
 dbaccess/uiconfig/ui/ldapconnectionpage.ui |2 
 dbaccess/uiconfig/ui/ldappage.ui   |2 
 dbaccess/uiconfig/ui/migratepage.ui|2 
 dbaccess/uiconfig/ui/odbcpage.ui   |4 -
 dbaccess/uiconfig/ui/parametersdialog.ui   |2 
 dbaccess/uiconfig/ui/preparepage.ui|2 
 dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui  |2 
 dbaccess/uiconfig/ui/summarypage.ui|2 
 dbaccess/uiconfig/ui/userdetailspage.ui|4 -
 extensions/uiconfig/sbibliography/ui/choosedatasourcedialog.ui |2 
 extensions/uiconfig/sbibliography/ui/mappingdialog.ui  |2 
 sc/uiconfig/scalc/ui/retypepassdialog.ui   |4 -
 sd/uiconfig/simpress/ui/assistentdialog.ui |   12 ++---
 sd/uiconfig/simpress/ui/publishingdialog.ui|   22 
+-
 sw/uiconfig/swriter/ui/optredlinepage.ui   |2 
 uui/uiconfig/ui/macrowarnmedium.ui |2 
 25 files changed, 47 insertions(+), 47 deletions(-)

New commits:
commit 2fe5d93f82d2875b34301b67e6ccc4959bf4b575
Author: Caolán McNamara 
Date:   Tue Sep 9 17:11:31 2014 +0100

semibold->bold

Change-Id: I563f4530f2003ea3090cd15696ea53143f7b3aa6

diff --git a/dbaccess/uiconfig/ui/authentificationpage.ui 
b/dbaccess/uiconfig/ui/authentificationpage.ui
index 0e0bbf2..dfee010 100644
--- a/dbaccess/uiconfig/ui/authentificationpage.ui
+++ b/dbaccess/uiconfig/ui/authentificationpage.ui
@@ -17,7 +17,7 @@
 12
 Set up the user 
authentication
 
-  
+  
 
   
   
diff --git a/dbaccess/uiconfig/ui/autocharsetpage.ui 
b/dbaccess/uiconfig/ui/autocharsetpage.ui
index 8954f02..4ef3ae8 100644
--- a/dbaccess/uiconfig/ui/autocharsetpage.ui
+++ b/dbaccess/uiconfig/ui/autocharsetpage.ui
@@ -66,7 +66,7 @@
 False
 Data 
conversion
 
-  
+  
 
   
 
diff --git a/dbaccess/uiconfig/ui/backuppage.ui 
b/dbaccess/uiconfig/ui/backuppage.ui
index 68bec54..b7df59c 100644
--- a/dbaccess/uiconfig/ui/backuppage.ui
+++ b/dbaccess/uiconfig/ui/backuppage.ui
@@ -17,7 +17,7 @@
 0
 Backup your 
Document
 
-  
+  
 
   
   
diff --git a/dbaccess/uiconfig/ui/choosedatasourcedialog.ui 
b/dbaccess/uiconfig/ui/choosedatasourcedialog.ui
index 6e3032f..c2278af 100644
--- a/dbaccess/uiconfig/ui/choosedatasourcedialog.ui
+++ b/dbaccess/uiconfig/ui/choosedatasourcedialog.ui
@@ -118,7 +118,7 @@
 False
 Choose a Data 
Source:
 
-  
+  
 
   
 
diff --git a/dbaccess/uiconfig/ui/connectionpage.ui 
b/dbaccess/uiconfig/ui/connectionpage.ui
index 42dda38..537fc71 100644
--- a/dbaccess/uiconfig/ui/connectionpage.ui
+++ b/dbaccess/uiconfig/ui/connectionpage.ui
@@ -103,7 +103,7 @@
 False
 General
 
-  
+  
 
   
 
@@ -197,7 +197,7 @@
 False
 User 
authentication
 
-  
+  
 
   
 
@@ -282,7 +282,7 @@
 False
 JDBC 
properties
 
-  
+  
 
   
 
diff --git a/dbaccess/uiconfig/ui/dbasepage.ui 
b/dbaccess/uiconfig/ui/dbasepage.ui
index 6c7826c..cfc83eb 100644
--- a/dbaccess/uiconfig/ui/dbasepage.ui
+++ b/dbaccess/uiconfig/ui/dbasepage.ui
@@ -66,7 +66,7 @@
 False
 Data 
conversion
 
-  
+  
 
   
 
@@ -139,7 +139,7 @@
 False
 Optional 
settings
 
-  
+  
 
   
 
diff --git a/dbaccess/uiconfig/ui/dbwizconnectionpage.ui 
b/dbaccess/uiconfig/ui/dbwizconnectionpage.ui
index 81bb0ae..8920360 100644
--- a/dbaccess/uiconfig/ui/dbwizconnectionpage.ui
+++ b/dbaccess/uiconfig/ui/dbwizconnectionpage.ui
@@ -17,7 +17,7 @@
 start

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - solenv/bin solenv/inc

[Yuri Dario]

 solenv/bin/modules/installer/globals.pm   |2 +-
 solenv/bin/modules/installer/parameter.pm |   10 +-
 solenv/bin/modules/pre2par/parameter.pm   |9 +
 solenv/inc/libs.mk|5 -
 4 files changed, 23 insertions(+), 3 deletions(-)

New commits:
commit 13fcc38291a3d30d4610492e527e2f30c906e30a
Author: Yuri Dario 
Date:   Tue Sep 9 15:35:43 2014 +

#i118923# OS/2 port, use forward slashes for paths in installer scripts.

diff --git a/solenv/bin/modules/pre2par/parameter.pm 
b/solenv/bin/modules/pre2par/parameter.pm
index 92fe984..adae8e8 100644
--- a/solenv/bin/modules/pre2par/parameter.pm
+++ b/solenv/bin/modules/pre2par/parameter.pm
@@ -152,6 +152,15 @@ sub make_path_absolute
 }
 }
 
+if ( $pre2par::globals::isos2 )
+{
+if (!($$pathref =~ /^\s*\w\:/)) # this is a relative os2 path
+{
+$$pathref = cwd() . $pre2par::globals::separator . $$pathref;
+$$pathref =~ s/\\/\//g;
+}
+}
+
 $$pathref =~ s/\Q$pre2par::globals::separator\E\s*$//;  # removing ending 
slashes
 }
 
commit 0eda64e2bb03cda98844ffcf16bfc0215d9b706f
Author: Yuri Dario 
Date:   Tue Sep 9 15:34:20 2014 +

#i118923# OS/2 port, use forward slashes for paths in installer scripts.

diff --git a/solenv/bin/modules/installer/globals.pm 
b/solenv/bin/modules/installer/globals.pm
index e55bfcd..a3b2851 100644
--- a/solenv/bin/modules/installer/globals.pm
+++ b/solenv/bin/modules/installer/globals.pm
@@ -499,7 +499,7 @@ BEGIN
 $checksumfile = "so_checksum";
 $unopkgfile = "unopkg.bin";
 $separator = "/";
-$pathseparator = "\:";
+$pathseparator = "\;";
 $libextension = "\.dll";
 $isunix = 0;
 $iswin = 0;
diff --git a/solenv/bin/modules/installer/parameter.pm 
b/solenv/bin/modules/installer/parameter.pm
index 122abf5..526866c 100644
--- a/solenv/bin/modules/installer/parameter.pm
+++ b/solenv/bin/modules/installer/parameter.pm
@@ -246,8 +246,15 @@ sub make_path_absolute
 if (!($$pathref =~ /^\s*\w\:/)) # this is a relative windows path 
(no dos drive)
 {
 $$pathref = cwd() . $installer::globals::separator . $$pathref;
+if ( $installer::globals::isos2 )
+{
+$$pathref =~ s/\\/\//g;
+}
+else
+{
+$$pathref =~ s/\//\\/g;
+}
 
-$$pathref =~ s/\//\\/g;
 }
 }
 }
@@ -376,6 +383,7 @@ sub setglobalvariables
 {
 $installer::globals::unpackpath = cwd();
 if ( $installer::globals::iswin ) { $installer::globals::unpackpath =~ 
s/\//\\/g; }
+if ( $installer::globals::isos2 ) { $installer::globals::unpackpath =~ 
s/\\/\//g; }
 }
 
 if ( $installer::globals::localunpackdir ne "" ) { 
$installer::globals::unpackpath = $installer::globals::localunpackdir; }
commit c2063d3da2916dc0f6f81b81232ce9d6407d697d
Author: Yuri Dario 
Date:   Tue Sep 9 15:27:00 2014 +

#i125501# build fixes for enabling Category B also in OS/2 port.

diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index d8d70a9..361d9ce 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -326,6 +326,8 @@ UDMLIB=-ludm
 ULINGULIB=-lulingu
 .IF "$(SYSTEM_HUNSPELL)" == "YES"
 HUNSPELLLIB=$(HUNSPELL_LIBS)
+.ELIF "$(GUI)" == "OS2"
+HUNSPELLLIB=-lhunspell
 .ELSE
 HUNSPELLLIB=-lhunspell-1.3
 .ENDIF
@@ -333,11 +335,12 @@ HUNSPELLLIB=-lhunspell-1.3
 MYTHESLIB=$(MYTHES_LIBS)
 .ELIF "$(GUI)" == "OS2"
 MYTHESLIB=-lmythes
+COINMPLIBS=-lCoinMP
 .ELSE
 MYTHESLIB=-lmythes-1.2
+COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
 .ENDIF
 PYUNOLIB=-lpyuno
-COINMPLIBS=-lCoinMP -lCoinUtils -lClp -lCbc -lOsi -lOsiClp -lCgl -lCbcSolver
 INTERNAL_APR_LIBS=-lapr-1
 INTERNAL_APR_UTIL_LIBS=-laprutil-1
 INTERNAL_SERF_LIBS=-lserf-1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Jaumann]

 unotools/qa/unit/testGetEnlishSearchName.cxx |   29 +--
 1 file changed, 19 insertions(+), 10 deletions(-)

New commits:
commit a1d51bf9aa9742eede83ae016360381c5c0e
Author: Michael Jaumann 
Date:   Tue Sep 9 08:58:52 2014 +

fdo#82854 extended unit-tests

Conflicts:
unotools/qa/unit/testGetEnlishSearchName.cxx

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

diff --git a/unotools/qa/unit/testGetEnlishSearchName.cxx 
b/unotools/qa/unit/testGetEnlishSearchName.cxx
index 1701215..06ffcef 100644
--- a/unotools/qa/unit/testGetEnlishSearchName.cxx
+++ b/unotools/qa/unit/testGetEnlishSearchName.cxx
@@ -28,27 +28,36 @@ public:
 };
 
 void Test::setUp()
-{};
+{
+}
 
 void Test::testSingleElement()
 {
 {   // lowercase
 OUString test1 = GetEnglishSearchFontName( "SYMBOL" );
-CPPUNIT_ASSERT_EQUAL(test1, OUString("symbol"));
-// trailingWhitespaces
+CPPUNIT_ASSERT_EQUAL( OUString("symbol"),test1);
+//trailingWhitespaces
 test1 = GetEnglishSearchFontName( "Symbol" );
-CPPUNIT_ASSERT_EQUAL(test1, OUString("symbol"));
-// removing Skripts
+CPPUNIT_ASSERT_EQUAL(OUString("symbol"),test1);
+//removing Skripts
 test1 = GetEnglishSearchFontName( "Symbol(skript)" );
-CPPUNIT_ASSERT_EQUAL(test1, OUString("symbol"));
-// remove Whitespaces between
+CPPUNIT_ASSERT_EQUAL(OUString("symbol"),test1);
+//remove Whitespaces between
 test1 = GetEnglishSearchFontName( "Symbol (skript)" );
-CPPUNIT_ASSERT_EQUAL(test1, OUString("symbol"));
-// trailingWhitespaces
+CPPUNIT_ASSERT_EQUAL( OUString("symbol"),test1);
+//remove special characters; leave semicolon, numbers
+test1 = GetEnglishSearchFontName( "sy;mb?=ol129" );
+CPPUNIT_ASSERT_EQUAL( OUString("sy;mbol129"),test1);
+
+//transformation
+
+sal_Unicode const transfor[] ={ 0x30D2, 0x30E9, 0x30AE, 0x30CE, 
0x4E38, 0x30B4, 'p','r','o','n',0};
+
+test1 = GetEnglishSearchFontName(transfor );
+CPPUNIT_ASSERT_EQUAL( OUString("hiraginomarugothicpron"),test1);
 }
 }
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 CPPUNIT_PLUGIN_IMPLEMENT();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Douglas Mencken]

 l10ntools/source/export.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 9e773854c8cd24e526a6beed6bee74313a7fd47b
Author: Douglas Mencken 
Date:   Sun Sep 7 05:56:50 2014 -0400

l10ntools/source/export.cxx: add sanity check to aOutput.mSimple

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

diff --git a/l10ntools/source/export.cxx b/l10ntools/source/export.cxx
index efd336d..49805cc 100644
--- a/l10ntools/source/export.cxx
+++ b/l10ntools/source/export.cxx
@@ -233,6 +233,11 @@ Export::Export(
 {
 aOutput.mSimple = new std::ofstream();
 aOutput.mSimple->open(rOutput.getStr(), std::ios_base::out | 
std::ios_base::trunc);
+if (!aOutput.mSimple->is_open())
+{
+std::fprintf(stderr, "ERROR : Can't open file %s\n", rOutput.getStr());
+std::exit(EXIT_FAILURE);
+}
 
 if ( bUTF8BOM ) WriteUTF8ByteOrderMarkToOutput();
 }
___
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' - svtools/source

[Niklas Johansson]

 svtools/source/contnr/svimpbox.cxx |   22 ++
 1 file changed, 18 insertions(+), 4 deletions(-)

New commits:
commit f36ca2f32d8f27681b2a1ef9fd7f59db21f67ec6
Author: Niklas Johansson 
Date:   Sun Aug 17 20:53:47 2014 +0200

Treeview may lose focus when left/right arrow is used

In a treeview, for example the hierarchal view of the
styles and formatting panel, if your not on a node that is
expandable or collapsable when you press the left or right
arrow key, the focus will move away from the tree view in
a very awkward way. This patch makes the control work more
like a native treeview.

At this point I don't feel confident about the surrounding
code to avoid the code duplication that this patch adds.

Reviewed-on: https://gerrit.libreoffice.org/10956
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 
(cherry picked from commit a6f78bf8fd5dc768cc8c37ca717d7bad8fe2dc81)

Change-Id: Ibd04cf5329b4d226aac102d214a45e45811982e7
Reviewed-on: https://gerrit.libreoffice.org/11255
Reviewed-by: Thomas Arnhold 
Tested-by: Thomas Arnhold 
(cherry picked from commit bee7674a602123229b62cad23536f103496a5298)
Reviewed-on: https://gerrit.libreoffice.org/11310
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svtools/source/contnr/svimpbox.cxx 
b/svtools/source/contnr/svimpbox.cxx
index 0099dd2..07ac082 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -2223,8 +2223,13 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
 
 case KEY_RIGHT:
 {
-if( bSubLstOpLR && IsNowExpandable() )
-pView->Expand( pCursor );
+if( bSubLstOpLR )
+{
+// only try to expand if sublist is expandable,
+// otherwise ignore the key press
+if( IsNowExpandable() )
+pView->Expand( pCursor );
+}
 else if ( bIsCellFocusEnabled && pCursor )
 {
 if ( nCurTabPos < ( pView->TabCount() - 1 /*!2*/ ) )
@@ -2290,8 +2295,17 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
 }
 }
 }
-else if( bSubLstOpLR && IsExpandable() )
-pView->Collapse( pCursor );
+else if( bSubLstOpLR )
+{
+if( IsExpandable() && pView->IsExpanded( pCursor ) )
+pView->Collapse( pCursor );
+else
+{
+pNewCursor = pView->GetParent( pCursor );
+if( pNewCursor )
+SetCursor( pNewCursor );
+}
+}
 else
 bKeyUsed = false;
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in

[Tor Lillqvist]

 Makefile.in |2 --
 1 file changed, 2 deletions(-)

New commits:
commit a6ac672eea5fb563346024f9adfc66ab5011cb5f
Author: Tor Lillqvist 
Date:   Tue Sep 9 18:25:52 2014 +0300

Surely by now nobody has a 'solver' folder or an 'install' symlink any more

Change-Id: I814311cc0b3e78774f25cac06e48dbdc1cb82c69

diff --git a/Makefile.in b/Makefile.in
index 94d9945..0080a10 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -141,8 +141,6 @@ clean-host:
rm -fr $(TESTINSTALLDIR)
rm -fr $(INSTDIR)
rm -fr $(WORKDIR)
-   rm -fr solver
-   rm -fr install
 
 clean-build:
 ifneq ($(CROSS_COMPILING),)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac

[Boris Egorov]

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

New commits:
commit bbe459487979236e5faab57eb7d575f8295b6677
Author: Boris Egorov 
Date:   Tue Sep 9 01:28:28 2014 +0700

configure.ac: fix error message when md5sum is missing

I tried to run autogen.sh on freshly cloned LO repo. It prints kind of
cryptic message to say that md5sum utility is missing:

configure: error: no md5sum: found!

Too many colons. I removed one, now it says:

configure: error: no md5sum found!

FYI: this message was printing when I used md5sum from Inferno OS
project. LO probably needs some options which Inferno version don't
support (--version at least).

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

diff --git a/configure.ac b/configure.ac
index d2a9e82..cce3519 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12344,7 +12344,7 @@ if test "$MD5SUM" = "md5"; then
 fi
 
 if test -z "$MD5SUM"; then
-AC_MSG_ERROR([no md5sum: found!])
+AC_MSG_ERROR([no md5sum found!])
 fi
 
 AC_SUBST(MD5SUM)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/qa/extras/rtfexport/data/abi10076.odt|binary
 sw/qa/extras/rtfexport/rtfexport.cxx|5 +
 sw/source/filter/ww8/rtfattributeoutput.cxx |7 +++
 3 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 2f33111510c87ca310fde346e223bd6e750b2248
Author: Miklos Vajna 
Date:   Tue Sep 9 17:15:56 2014 +0200

abi#10076 RTF export: handle frames without a valid anchor point

Ideally all frames have an anchor point in the maFrames vector, as
provided by MSWordExportBase. If that's not the case, then we have no
idea what would be a valid anchor point: just export those as inline, as
we did before.

Change-Id: I81134d9fb8dc4ca166084964d277ac02ceccde7b

diff --git a/sw/qa/extras/rtfexport/data/abi10076.odt 
b/sw/qa/extras/rtfexport/data/abi10076.odt
new file mode 100644
index 000..4ac6aa5
Binary files /dev/null and b/sw/qa/extras/rtfexport/data/abi10076.odt differ
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx 
b/sw/qa/extras/rtfexport/rtfexport.cxx
index f11f0bb..bdcb26b 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -686,6 +686,11 @@ DECLARE_RTFEXPORT_TEST(testAbi10039, "abi10039.odt")
 CPPUNIT_ASSERT(text::TextContentAnchorType_AS_CHARACTER != 
getProperty(getShape(1), "AnchorType"));
 }
 
+DECLARE_RTFEXPORT_TEST(testAbi10076, "abi10076.odt")
+{
+// Just make sure that we don't crash after exporting a fully calculated 
layout.
+}
+
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx 
b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 570af9b..653c5ad 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -3703,7 +3703,6 @@ void RtfAttributeOutput::FlyFrameGraphic(const 
SwFlyFrmFmt* pFlyFrmFmt, const Sw
 break;
 }
 }
-assert(pFrame);
 
 /*
If the graphic is not of type WMF then we will have to store two
@@ -3712,7 +3711,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const 
SwFlyFrmFmt* pFlyFrmFmt, const Sw
a wmf already then we don't need any such wrapping
*/
 bool bIsWMF = pBLIPType && std::strcmp(pBLIPType, 
OOO_STRING_SVTOOLS_RTF_WMETAFILE) == 0;
-if (pFrame->IsInline())
+if (!pFrame || pFrame->IsInline())
 {
 if (!bIsWMF)
 m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_IGNORE 
OOO_STRING_SVTOOLS_RTF_SHPPICT);
@@ -3766,7 +3765,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const 
SwFlyFrmFmt* pFlyFrmFmt, const Sw
 m_rExport.Strm().WriteCharPtr("{" OOO_STRING_SVTOOLS_RTF_SP "{" 
OOO_STRING_SVTOOLS_RTF_SN " pib" "}{" OOO_STRING_SVTOOLS_RTF_SV " ");
 }
 
-bool bWritePicProp = pFrame->IsInline();
+bool bWritePicProp = !pFrame || pFrame->IsInline();
 if (pBLIPType)
 ExportPICT(pFlyFrmFmt, aSize, aRendered, aMapped, rCr, pBLIPType, 
pGraphicAry, nSize, m_rExport, &m_rExport.Strm(), bWritePicProp);
 else
@@ -3781,7 +3780,7 @@ void RtfAttributeOutput::FlyFrameGraphic(const 
SwFlyFrmFmt* pFlyFrmFmt, const Sw
 ExportPICT(pFlyFrmFmt, aSize, aRendered, aMapped, rCr, pBLIPType, 
pGraphicAry, nSize, m_rExport, &m_rExport.Strm(), bWritePicProp);
 }
 
-if (pFrame->IsInline())
+if (!pFrame || pFrame->IsInline())
 {
 if (!bIsWMF)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: configure.ac mysqlc/README

[Lionel Elie Mamane]

 configure.ac  |6 --
 mysqlc/README |   10 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 2e01b87378e78945791b09318135b36b16edf0aa
Author: Lionel Elie Mamane 
Date:   Tue Sep 9 17:03:56 2014 +0200

fdo#83656 mariadb C client library incompatible with newer MySQL 
Connector/C++

Change-Id: I0d9cc98070c0b9379b1fd828ac65c2d32f83a93f

diff --git a/configure.ac b/configure.ac
index b7d2fe0..d2a9e82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8224,11 +8224,12 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
 if test "$with_system_mariadb" = "yes"; then
 AC_MSG_RESULT([external])
 SYSTEM_MARIADB=TRUE
-AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
+#AC_PATH_PROG(MARIADBCONFIG, [mariadb_config])
 if test -z "$MARIADBCONFIG"; then
 AC_PATH_PROG(MARIADBCONFIG, [mysql_config])
 if test -z "$MARIADBCONFIG"; then
-AC_MSG_ERROR([mariadb_config and mysql_config are missing. 
Install MariaDB or MySQL development package.])
+AC_MSG_ERROR([mysql_config is missing. Install MySQL client 
library development package.])
+#AC_MSG_ERROR([mariadb_config and mysql_config are missing. 
Install MariaDB or MySQL client library development package.])
 fi
 fi
 AC_MSG_CHECKING([MariaDB version])
@@ -8285,6 +8286,7 @@ if test "$ENABLE_MARIADBC" = "TRUE"; then
 fi
 else
 AC_MSG_RESULT([internal])
+AC_MSG_ERROR([libmariadb is known to be incompatible as of 2014-09; 
use libmysqlclient])
 SYSTEM_MARIADB=
 MARIADB_CFLAGS="-I${WORKDIR}/UnpackedTarball/mariadb/include"
 MARIADB_LIBS="-L${WORKDIR}/LinkTarget/StaticLibrary -lmariadblib"
diff --git a/mysqlc/README b/mysqlc/README
index 8d0968f..baf0747 100644
--- a/mysqlc/README
+++ b/mysqlc/README
@@ -34,7 +34,7 @@ package/port for GNU/Linux, BSD, etc, where the packaging 
system
 handles dependencies and will ensure the availability of the MySQL
 client C library in the standard location.
 
-If configured with--with-system-mariadb --enable-bundle-mariadb, the
+If configured with --with-system-mariadb --enable-bundle-mariadb, the
 driver will ship a copy of the MariaDB (or MySQL) client C library so
 that it works "out of the box" on any system. That (or
 --without-system-mariadb) is usually the right choice to create a
@@ -55,9 +55,13 @@ libraries themselves.
 
 Else you can install the MariaDB Client Library from official MariaDB
 packages at https://downloads.mariadb.org/client-native/ .
-At least series 2.0 is recommended, as series 1.0 are known to be too
-buggy.
 They have source and binary distributions for several platforms.
+At least series 2.0 is recommended, as series 1.0 are known to be too
+buggy. Additionally, version 2.0.0 is known to be incompatible with
+MySQL Connector/C++ version 1.1.4, which --without-system-mysqlcppconn
+uses, and which --with-system-mysqlcppconn could use
+(see https://mariadb.atlassian.net/browse/CONC-104).
+Use a version where the above incompatibility has been solved.
 
 Alternativaly, MySQL Client Library from official MySQL
 packages are at http://dev.mysql.com/downloads/connector/c/ .
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan-Marek Glogowski]

 sc/source/filter/inc/addressconverter.hxx  |   45 +++--
 sc/source/filter/oox/addressconverter.cxx  |   10 +-
 sc/source/filter/oox/condformatbuffer.cxx  |2 -
 sc/source/filter/oox/defnamesbuffer.cxx|5 +--
 sc/source/filter/oox/sheetdatabuffer.cxx   |   10 +++---
 sc/source/filter/oox/worksheethelper.cxx   |2 -
 sc/source/filter/oox/worksheetsettings.cxx |2 -
 sw/inc/IDocumentContentOperations.hxx  |   32 ++--
 sw/source/core/doc/docnew.cxx  |   20 +---
 9 files changed, 104 insertions(+), 24 deletions(-)

New commits:
commit ddffb797904c5ae1a5ab3bc66eeb9bfc168a0148
Author: Jan-Marek Glogowski 
Date:   Mon Jun 23 09:16:18 2014 +0200

Replace the whole content for copied documents

If the document is initialized in CreateCopy, it already contains
the initial empty paragraph. So we have to delete the content from
initial document, as we're going to replace the whole content with
the pasted document.

Change-Id: Ie6a64dcb070f7d611dfde97f2c1a721834b4167b
Reviewed-on: https://gerrit.libreoffice.org/10963
Reviewed-by: Björn Michaelsen 
Tested-by: Björn Michaelsen 

diff --git a/sw/inc/IDocumentContentOperations.hxx 
b/sw/inc/IDocumentContentOperations.hxx
index 5227528..8f64f1c 100644
--- a/sw/inc/IDocumentContentOperations.hxx
+++ b/sw/inc/IDocumentContentOperations.hxx
@@ -65,10 +65,36 @@ public:
 };
 
 public:
-/** Copying of a range within or to another document.
-The position can also be within the range!
+/** Copy a selected content range to a position
+
+The position can be in the same or in an another document. It can also
+be within the range!
+
+\warning The range has to include at least two nodes or has to be a
+SwDoc::IsColumnSelection!
+
+Normally this functions should work only with content nodes. But there
+is a special case used by SwDoc::Paste, which starts the SwPaM at the
+content start node. This position doesn't contain any content:
+
+@code
+SwNodeIndex aSourceIdx( rSource.GetNodes().GetEndOfExtras(), 1 );
+@endcode
+
+This is important, because it prevents merging of the first node of
+the range into the node pointed to by \p rPos.
+As a result this keeps all properties of the first real content node,
+which is the 2nd, including the Flys and the page description. In this
+case the first (fake) node is silently dropped and all other nodes are
+just copied.
+
+@param rPam
+The source node range to copy
+
+@param rPos
+The target copy destination
  */
-virtual bool CopyRange(SwPaM&, SwPosition&, const bool bCopyAll ) const = 
0;
+virtual bool CopyRange(SwPaM& rPam, SwPosition& rPos, const bool bCopyAll 
) const = 0;
 
 /** Delete section containing the node.
 */
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index c18fe20..1a7e76e 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -915,6 +915,12 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) const
 // copy content
 pRet->Paste( *this );
 
+if ( bCallInitNew ) {
+// delete leading page / initial content from target document
+SwNodeIndex aDeleteIdx( pRet->GetNodes().GetEndOfExtras(), 2 );
+pRet->GetNodes().Delete( aDeleteIdx, 1 );
+}
+
 // remove the temporary shell if it is there as it was done before
 pRet->SetTmpDocShell( (SfxObjectShell*)NULL );
 
@@ -926,12 +932,14 @@ SfxObjectShell* SwDoc::CreateCopy(bool bCallInitNew ) 
const
 // copy document content - code from SwFEShell::Paste( SwDoc* )
 void SwDoc::Paste( const SwDoc& rSource )
 {
-// this has to be empty const sal_uInt16 nStartPageNumber = 
GetPhyPageNum();
-// until the end of the NodesArray
-SwNodeIndex aSourceIdx( rSource.GetNodes().GetEndOfExtras(), 2 );
-SwPaM aCpyPam( aSourceIdx ); //DocStart
-SwNodeIndex aTargetIdx( GetNodes().GetEndOfExtras(), 2 );
-SwPaM aInsertPam( aTargetIdx ); //replaces PCURCRSR from SwFEShell::Paste()
+// GetEndOfExtras + 1 = StartOfContent == no content node!
+// this ensures, that we have at least two nodes in the SwPaM.
+// @see IDocumentContentOperations::CopyRange
+SwNodeIndex aSourceIdx( rSource.GetNodes().GetEndOfExtras(), 1 );
+SwPaM aCpyPam( aSourceIdx );
+
+SwNodeIndex aTargetIdx( GetNodes().GetEndOfContent() );
+SwPaM aInsertPam( aTargetIdx );
 
 aCpyPam.SetMark();
 aCpyPam.Move( fnMoveForward, fnGoDoc );
commit a685de59fce89ab77e1e03b0044621c3f43a00c3
Author: Takeshi Abe 
Date:   Tue Sep 9 15:20:31 2014 +0900

fdo#75757: remove inheritance to std::vector

from ApiCellRangeList.

Change-Id: I29913e0e437c112640b08187f8bea6b1f0f1c17c
Reviewed-on: https://gerrit.libreoffice.org/11349
Reviewed-by: Caolán McNamara 

[Bug 75757] remove inheritance to std::map and std::vector

[bugzilla-daemon]

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

--- Comment #32 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

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

fdo#75757: remove inheritance to std::vector



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

-- 
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 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

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

squeezech...@gmx.de changed:

   What|Removed |Added

 Depends on||66581

--- Comment #65 from squeezech...@gmx.de ---
Add bug #66581 - embedded objects do not get imported from XLSX

-- 
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: avmedia/source

[Daniel Sikeler]

 avmedia/source/viewer/mediawindow.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 62c0ff126a97df0601054fa15498f96077f7
Author: Daniel Sikeler 
Date:   Tue Sep 9 11:03:19 2014 +

fdo#82994: Changed filterlabel of .ac3-files

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

diff --git a/avmedia/source/viewer/mediawindow.cxx 
b/avmedia/source/viewer/mediawindow.cxx
index 3fe..10a32db 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -203,7 +203,7 @@ void MediaWindow::getMediaFilters( FilterNameVector& 
rFilterNameVector )
   "AIF Audio", "aif;aiff",
   "Advanced Systems", "asf",
   "AU Audio", "au",
-  "Audio Codec", "ac3",
+  "AC3 Audio", "ac3",
   "AVI", "avi",
   "CD Audio", "cda",
   "Digital Video", "dv",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

getting help with Bug 71248 - Excel VBA: ActiveDocument is not tracking currently selected document

[Justin Luth]

  
  
Are sc/source/ui/vba/vbaapplications.cxx and
vbahelper/source/vbahelper/vbahelper.cxx ONLY used for MS VBA
compatibility, or does it also affect StarBasic etc?

I have identified that the vbahelper function getCurrentDoc() is
broken, causing bug 71248, and suggested a band-aid solution for it
in the comments.  However, I don't know the larger implications of
replacing getCurrentDoc with getThisExcelDoc.  In practice, THIS and
CURRENT are likely the same thing, but perhaps the current
implementation is necessary and working for someone...

I'm still going to try to figure out how to properly fix
"getCurrentDoc" but so far I don't really understand what it is
doing.  If someone who actually knows how to program and submit
patches could take over from this point, that would be great.

suggested Band-aid fix:
uno::Reference< frame::XModel > 
  getCurrentExcelDoc( const uno::Reference<
  uno::XComponentContext >& xContext ) throw
  (uno::RuntimeException)
  {
      return getThisExcelDoc( xContext
  );
}

Thanks,
Justin
https://bugs.freedesktop.org/show_bug.cgi?id=71248

  

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

[Bug 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

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

squeezech...@gmx.de changed:

   What|Removed |Added

 Depends on||65070

--- Comment #64 from squeezech...@gmx.de ---
Add bug #65070 - spreadsheet background doesn't get displayed/imported

-- 
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: oox/source

[Michael Stahl]

 oox/source/drawingml/table/tablecell.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 45582edd8dcbfba0c91c53dfd76a18ad06011721
Author: Michael Stahl 
Date:   Tue Sep 9 16:53:17 2014 +0200

oox: improve code formatting

Change-Id: I16b1a80401369a8d78ea87a96daa3ee03d502e6f

diff --git a/oox/source/drawingml/table/tablecell.cxx 
b/oox/source/drawingml/table/tablecell.cxx
index f3810f1..dfca833 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -359,6 +359,7 @@ void TableCell::pushToXCell( const 
::oox::core::XmlFilterBase& rFilterBase, ::oo
 if (rBackgroundFillPropertiesPtr.get())
 aBgColor = rBackgroundFillPropertiesPtr->getBestSolidColor();
 else if (rBackgroundFillStyle.mnThemedIdx != 0)
+{
 if (const Theme* pTheme = rFilterBase.getCurrentTheme())
 {
 FillProperties const*const pStyle(
@@ -369,6 +370,7 @@ void TableCell::pushToXCell( const 
::oox::core::XmlFilterBase& rFilterBase, ::oo
 nPhClr = 
rBackgroundFillStyle.maPhClr.getColor(rFilterBase.getGraphicHelper());
 }
 }
+}
 if (aBgColor.isUsed())
 {
 const Color& rCellColor = aFillProperties.getBestSolidColor();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

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

squeezech...@gmx.de changed:

   What|Removed |Added

 Depends on||83675

--- Comment #63 from squeezech...@gmx.de ---
Add bug #83675 - embedded fonts are double and also non-used fonts are embedded
- but the used font is not embedded

-- 
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: oox/source

[Michael Stahl]

 oox/source/drawingml/table/tablecell.cxx |9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)

New commits:
commit ba1ae835fa3629deb64b0a7a359cadc5aa0a9763
Author: Michael Stahl 
Date:   Tue Sep 9 16:48:29 2014 +0200

oox: fix 0-pointer crash in sd_import_tests

(regression from 43efd9b40d40b791a2c2deedcac36b99f7efb2cf)

Change-Id: Ib8ee521cf8142000cbd38a7475772cc3455f7357

diff --git a/oox/source/drawingml/table/tablecell.cxx 
b/oox/source/drawingml/table/tablecell.cxx
index 4053325..f3810f1 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -361,8 +361,13 @@ void TableCell::pushToXCell( const 
::oox::core::XmlFilterBase& rFilterBase, ::oo
 else if (rBackgroundFillStyle.mnThemedIdx != 0)
 if (const Theme* pTheme = rFilterBase.getCurrentTheme())
 {
-aBgColor = 
pTheme->getFillStyle(rBackgroundFillStyle.mnThemedIdx)->getBestSolidColor();
-nPhClr = 
rBackgroundFillStyle.maPhClr.getColor(rFilterBase.getGraphicHelper());
+FillProperties const*const pStyle(
+pTheme->getFillStyle(rBackgroundFillStyle.mnThemedIdx));
+if (pStyle)
+{
+aBgColor = pStyle->getBestSolidColor();
+nPhClr = 
rBackgroundFillStyle.maPhClr.getColor(rFilterBase.getGraphicHelper());
+}
 }
 if (aBgColor.isUsed())
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75025] LibreOffice 4.3 most annoying bugs

[bugzilla-daemon]

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

squeezech...@gmx.de changed:

   What|Removed |Added

 Depends on||83666

--- Comment #62 from squeezech...@gmx.de ---
Add bug #83666 - Opening this XLSX in Calc does not display all conditional
formats

-- 
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: Branch 'libreoffice-4-3' - sd/source

[Caolán McNamara]

 sd/source/core/stlsheet.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c4c11a1b9e7b9c88dc7f64bfb5eb5d316c7b5366
Author: Caolán McNamara 
Date:   Tue Sep 9 15:32:49 2014 +0100

crashtest: sep should be curSep

Change-Id: Ic83165ee4af86d0ed0bc77505aae8f50cfc1471a
(cherry picked from commit 3669242804e59c4e4d9f3db3d4e4534e223cbd78)
Reviewed-on: https://gerrit.libreoffice.org/11361
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index b103ab0..5df055f 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -978,7 +978,7 @@ void SAL_CALL SdStyleSheet::setParentStyle( const OUString& 
rParentName  ) throw
 OUString const curName(pStyle->GetName());
 sal_Int32 const curSep(curName.indexOf(SD_LT_SEPARATOR));
 OUString const curMaster((curSep == -1)
-? OUString() : curName.copy(0, sep));
+? OUString() : curName.copy(0, curSep));
 // check that the master matches, as msApiName exists once per
 // master page
 if (pSdStyleSheet->msApiName == rParentName && master == curMaster)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sd/source/core/stlsheet.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3669242804e59c4e4d9f3db3d4e4534e223cbd78
Author: Caolán McNamara 
Date:   Tue Sep 9 15:32:49 2014 +0100

crashtest: sep should be curSep

Change-Id: Ic83165ee4af86d0ed0bc77505aae8f50cfc1471a

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index aaeed29..757c378 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -931,7 +931,7 @@ void SAL_CALL SdStyleSheet::setParentStyle( const OUString& 
rParentName  ) throw
 OUString const curName(pStyle->GetName());
 sal_Int32 const curSep(curName.indexOf(SD_LT_SEPARATOR));
 OUString const curMaster((curSep == -1)
-? OUString() : curName.copy(0, sep));
+? OUString() : curName.copy(0, curSep));
 // check that the master matches, as msApiName exists once per
 // master page
 if (pSdStyleSheet->msApiName == rParentName && master == curMaster)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/uibase/utlui/glbltree.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a29ece90621b2fef9126a6e9a976561ce5d1b461
Author: Caolán McNamara 
Date:   Tue Sep 9 15:03:37 2014 +0100

Resolves: fdo#83251 menu on master doc insert disappears

on releaseing mouse button

Change-Id: Ia2f8da6e62d708744707b8187d5961fe12169eb8

diff --git a/sw/source/uibase/utlui/glbltree.cxx 
b/sw/source/uibase/utlui/glbltree.cxx
index 063c304..83f23c3 100644
--- a/sw/source/uibase/utlui/glbltree.cxx
+++ b/sw/source/uibase/utlui/glbltree.cxx
@@ -396,7 +396,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* 
pBox)
 pMenu->EnableItem(CTX_INSERT_FILE,  0 != (nEnableFlags & 
ENABLE_INSERT_FILE));
 pMenu->EnableItem(CTX_INSERT_NEW_FILE,  0 != (nEnableFlags & 
ENABLE_INSERT_FILE));
 pMenu->SetSelectHdl(LINK(this, SwGlobalTree, PopupHdl));
-pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft());
+pMenu->Execute(pBox, pBox->GetItemRect(nTbxId));
 pMenu.reset();
 pBox->EndSelection();
 pBox->Invalidate();
@@ -411,7 +411,7 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* 
pBox)
 }
 pMenu->EnableItem(CTX_UPDATE_SEL, 0 != (nEnableFlags & 
ENABLE_UPDATE_SEL));
 pMenu->SetSelectHdl(LINK(this, SwGlobalTree, PopupHdl));
-pMenu->Execute( pBox, pBox->GetItemRect(nTbxId).BottomLeft());
+pMenu->Execute(pBox, pBox->GetItemRect(nTbxId));
 pMenu.reset();
 pBox->EndSelection();
 pBox->Invalidate();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Stephan Bergmann]

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

New commits:
commit 83c5102abfe4d3d003ffe68878beb29a29fe89b9
Author: Stephan Bergmann 
Date:   Tue Sep 9 15:21:55 2014 +0200

Updated core
Project: help  70fc0dc34e884699f250091bebe4b9e2e858063f

diff --git a/helpcontent2 b/helpcontent2
index 8b3f1eb..70fc0dc 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 8b3f1eb34638d512b8dbe3e426e28bbf50439e90
+Subproject commit 70fc0dc34e884699f250091bebe4b9e2e858063f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 AllLangHelp_shared.mk|1 
 source/text/shared/guide/activex.xhp |1 
 source/text/shared/optionen/01020400.xhp |   59 ---
 source/text/shared/optionen/0103.xhp |2 -
 4 files changed, 1 insertion(+), 62 deletions(-)

New commits:
commit 70fc0dc34e884699f250091bebe4b9e2e858063f
Author: Stephan Bergmann 
Date:   Tue Sep 9 15:21:55 2014 +0200

fdo#45071: Remove ENABLE_NPAPI_INTO_BROWSER left-overs

...from previous commit 496bc3cd6c037360632c33471c4622a095cdcadd "fdo#45071
Remove Libreoffice browser plugin"

Change-Id: Iad66c80c5f54be8e5199ed633a7a884a44f7e989

diff --git a/AllLangHelp_shared.mk b/AllLangHelp_shared.mk
index 0f15299..2210bb9 100644
--- a/AllLangHelp_shared.mk
+++ b/AllLangHelp_shared.mk
@@ -848,7 +848,6 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,shared,\
 helpcontent2/source/text/shared/optionen/0102 \
 helpcontent2/source/text/shared/optionen/01020100 \
 helpcontent2/source/text/shared/optionen/01020300 \
-helpcontent2/source/text/shared/optionen/01020400 \
 helpcontent2/source/text/shared/optionen/0103 \
 helpcontent2/source/text/shared/optionen/01030300 \
 helpcontent2/source/text/shared/optionen/01030500 \
diff --git a/source/text/shared/guide/activex.xhp 
b/source/text/shared/guide/activex.xhp
index 7239c13..0abef31 100644
--- a/source/text/shared/guide/activex.xhp
+++ b/source/text/shared/guide/activex.xhp
@@ -84,7 +84,6 @@
 
 
 
-
 
 
 
diff --git a/source/text/shared/optionen/01020400.xhp 
b/source/text/shared/optionen/01020400.xhp
deleted file mode 100644
index a039106..000
--- a/source/text/shared/optionen/01020400.xhp
+++ /dev/null
@@ -1,59 +0,0 @@
-
-
-   
-
- 
-   
-
-  
- Browser Plug-in
- /text/shared/optionen/01020400.xhp
-  
-   
-   
-  
-  
-  Browser Plug-in
-  Specifies to use the Mozilla plug-in to show %PRODUCTNAME 
documents.
-  
-  When you click any %PRODUCTNAME document hyperlink in your Mozilla 
or Netscape browser, one of the following can happen:
-  
- 
-The browser asks you whether you want to save the document on your 
disk, or whether you want to use an application to open the document. This 
request dialog appears by default when you click any %PRODUCTNAME document 
hyperlink the first time and you did not enable the Browser Plug-in.
- 
- 
-The browser downloads the document to a temporary folder, then tells 
your system to run %PRODUCTNAME and open the document in %PRODUCTNAME. This is 
the default when you did not enable the Browser Plug-in and chose to open the 
document with %PRODUCTNAME when you were first asked.
- 
- 
-The browser opens a new browser window that shows some of the 
%PRODUCTNAME icons, and displays the document in the browser window. This is 
the default when you enable the Browser Plug-in. When you click the Edit 
File icon, a copy of the document is downloaded to a temporary folder on 
your disk, then %PRODUCTNAME starts and loads the copy for editing.
- 
-  
-
-Display documents in browser
-  Enables the Browser 
Plug-in to show %PRODUCTNAME documents in a browser window. Select, click OK, 
then restart your browser. Then, in the browser window, click any %PRODUCTNAME 
document hyperlink.
-  The plug-in needs a version of Mozilla, Netscape, or Firefox 
installed on your system.
-
-
-
- 
-  
-
-
-
-
diff --git a/source/text/shared/optionen/0103.xhp 
b/source/text/shared/optionen/0103.xhp
index f8b321a..0f051c5 100644
--- a/source/text/shared/optionen/0103.xhp
+++ b/source/text/shared/optionen/0103.xhp
@@ -41,7 +41,7 @@
 
 
 
-
+
   

 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - bin/distro-install-file-lists config_host.mk.in configure.ac cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk distro-configs/OxygenOfficeLinux

[Stephan Bergmann]

 Repository.mk  |7 
 bin/distro-install-file-lists  |3 
 config_host.mk.in  |1 
 configure.ac   |   19 
 cui/Library_cui.mk |6 
 cui/UIConfig_cui.mk|1 
 cui/source/dialogs/winpluginlib.cxx|  196 ---
 cui/source/inc/cuires.hrc  |1 
 cui/source/options/optinet2.cxx|  196 ---
 cui/source/options/optinet2.hxx|   21 
 cui/source/options/treeopt.cxx |   29 
 cui/source/options/treeopt.src |1 
 cui/uiconfig/ui/optbrowserpage.ui  |   42 
 distro-configs/OxygenOfficeLinux.conf  |1 
 extensions/Executable_nsplugin.mk  |   69 -
 extensions/Library_npsoplugin.mk   |  104 -
 extensions/Module_extensions.mk|   16 
 extensions/StaticLibrary_npsoenv.mk|   17 
 extensions/WinResTarget_npsoplugin.mk  |   21 
 extensions/source/nsplugin/source/npshell.cxx  |  930 -
 extensions/source/nsplugin/source/npshell.hxx  |   99 -
 extensions/source/nsplugin/source/ns_debug.hxx |   44 
 extensions/source/nsplugin/source/nsp_func.hxx |  103 -
 extensions/source/nsplugin/source/nsp_windows.cxx  |   59 -
 extensions/source/nsplugin/source/nsp_windows.hxx  |   51 
 extensions/source/nsplugin/source/nsplugin_oo.rc   |  158 --
 extensions/source/nsplugin/source/so_closelistener.cxx |   48 
 extensions/source/nsplugin/source/so_closelistener.hxx |   56 -
 extensions/source/nsplugin/source/so_env.cxx   |  507 -
 extensions/source/nsplugin/source/so_env.hxx   |   95 -
 extensions/source/nsplugin/source/so_instance.cxx  |  441 
 extensions/source/nsplugin/source/so_instance.hxx  |  114 --
 extensions/source/nsplugin/source/so_main.cxx  |  494 -
 extensions/source/nsplugin/source/so_msg.hxx   |   61 -
 external/Module_external.mk|1 
 external/np_sdk/Makefile   |7 
 external/np_sdk/Module_np_sdk.mk   |   23 
 external/np_sdk/StaticLibrary_nputils.mk   |   33 
 external/np_sdk/npsdk/README   |2 
 external/np_sdk/npsdk/npunix.c |  507 -
 external/np_sdk/npsdk/npwin.cxx|  359 --
 external/np_sdk/npsdk/plugin.h |   44 
 scp2/InstallModule_ooo.mk  |1 
 scp2/source/ooo/common_brand.scp   |   10 
 scp2/source/ooo/file_ooo.scp   |   13 
 scp2/source/ooo/module_hidden_ooo.scp  |1 
 46 files changed, 3 insertions(+), 5009 deletions(-)

New commits:
commit d968c28287c8ffbaf6fd6da3a5d872adc8e354b4
Author: Stephan Bergmann 
Date:   Tue Sep 9 15:19:05 2014 +0200

fdo#45071: Remove ENABLE_NPAPI_INTO_BROWSER left-overs

...from previous commit

Change-Id: I945faa6215f971ce817c6450fe0786da0696091f

diff --git a/bin/distro-install-file-lists b/bin/distro-install-file-lists
index 87c2a09..167d514 100755
--- a/bin/distro-install-file-lists
+++ b/bin/distro-install-file-lists
@@ -332,7 +332,6 @@ if test "z$OOO_VENDOR" != "zDebian" ; then
 program/configimport.bin \
 program/javaldx \
 program/msfontextract \
-program/nsplugin \
 program/oosplash.bin \
 program/pagein \
 program/pagein-calc \
@@ -495,7 +494,7 @@ else
   fi &&
   ( cd pkg/libreoffice-common/$d
 find -maxdepth 1 \
-   -regex 
'\./\(.*\.so.*\|.*\.bin\|pagein\|nsplugin\|tdefilepicker\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)'
 \
+   -regex 
'\./\(.*\.so.*\|.*\.bin\|pagein\|tdefilepicker\|kdefilepicker\|msfontextract\|.*\.rdb\|javaldx\|uri-encode\)'
 \
-exec mv {} $DESTDIR/pkg/libreoffice-core/$d \;
   ); \
 done
diff --git a/cui/Library_cui.mk b/cui/Library_cui.mk
index 90958b3..60808ef 100644
--- a/cui/Library_cui.mk
+++ b/cui/Library_cui.mk
@@ -199,10 +199,4 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
 cui/source/uno/services \
 ))
 
-ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_exception_objects,cui,\
-cui/source/dialogs/winpluginlib \
-))
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/cui/UIConfig_cui.mk b/cui/UIConfig_cui.mk
index c806bfc..70438d4 100644
--- a/cui/UIConfig_cui.mk
+++ b/cui/UIConfig_cui.mk
@@ -116,7 +116,6 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/optappearancepage \
cui/uiconfig/ui/optasianpage \
cui/uiconfig

[Bug 46200] [RFE] Use the Scroll Lock key as a toggling lock key like Excel

[bugzilla-daemon]

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

--- Comment #8 from je...@live.de ---
The scroll lock is not implemented in linux (ubuntu) like in windows. When I
press the key under linux the third led is not shining. So I think it's much
work to solve this problem both in windows and in linux.

-- 
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: wizards/com

[Noel Grandin]

 wizards/com/sun/star/wizards/report/CallReportWizard.java |  247 --
 1 file changed, 143 insertions(+), 104 deletions(-)

New commits:
commit 1d62f6a24f6160c33ad5c96f39b2ab3c918f0625
Author: Noel Grandin 
Date:   Tue Sep 9 14:01:15 2014 +0200

fix accidental removal of Java wizard code

in commit 34bcf9b498bccb5c "java: remove dead methods"

Change-Id: Id6d15248f0410a78afa803a72ba3ff0b6a8e7635

diff --git a/wizards/com/sun/star/wizards/report/CallReportWizard.java 
b/wizards/com/sun/star/wizards/report/CallReportWizard.java
index d6e3881..0126794 100644
--- a/wizards/com/sun/star/wizards/report/CallReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/CallReportWizard.java
@@ -27,142 +27,181 @@ import com.sun.star.wizards.common.PropertyNames;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-/** This class implements the component. At least the interfaces XServiceInfo,
- * XTypeProvider, and XInitialization should be provided by the service.
+/** This class capsulates the class, that implements the minimal component, a
+ * factory for creating the service (__getServiceFactory).
  */
 public class CallReportWizard
-  extends com.sun.star.lib.uno.helper.PropertySet implements 
com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, 
com.sun.star.task.XJobExecutor
 {
 
-private static boolean bWizardStartedAlready;
-
-/** The service name, that must be used to get an instance of this service.
- */
-private static final String __serviceName = 
"com.sun.star.wizards.report.CallReportWizard";
-
-private PropertyValue[] m_wizardContext;
-
-/** The constructor of the inner class has a XMultiServiceFactory 
parameter.
- * @param xmultiservicefactoryInitialization A special service factory
- * could be introduced while initializing.
+private static boolean bWizardstartedalready;
+
+/** Gives a factory for creating the service.
+ * This method is called by the JavaLoader
+ * 
+ * @return Returns a XSingleServiceFactory for creating the 
component.
+ * @see com.sun.star.comp.loader.JavaLoader
+ * @param stringImplementationName The implementation name of the 
component.
+ * @param xMSF The service manager, who gives access to every known 
service.
+ * @param xregistrykey Makes structural information (except regarding 
treestructures) of a single
+ *registry key accessible.
  */
-public CallReportWizard(com.sun.star.lang.XMultiServiceFactory 
xmultiservicefactoryInitialization)
+public static com.sun.star.lang.XSingleServiceFactory 
__getServiceFactory(String stringImplementationName, 
com.sun.star.lang.XMultiServiceFactory xMSF, com.sun.star.registry.XRegistryKey 
xregistrykey)
 {
-super();
-xmultiservicefactory = xmultiservicefactoryInitialization;
+com.sun.star.lang.XSingleServiceFactory xsingleservicefactory = null;
+if (stringImplementationName.equals(
+ReportWizardImplementation.class.getName()))
+{
+xsingleservicefactory = 
com.sun.star.comp.loader.FactoryHelper.getServiceFactory(
+ReportWizardImplementation.class,
+ReportWizardImplementation.__serviceName,
+xMSF,
+xregistrykey);
+}
+return xsingleservicefactory;
 }
 
-public void trigger(String sEvent)
+/** This class implements the component. At least the interfaces 
XServiceInfo,
+ * XTypeProvider, and XInitialization should be provided by the service.
+ */
+private static class ReportWizardImplementation extends 
com.sun.star.lib.uno.helper.PropertySet implements 
com.sun.star.lang.XInitialization, com.sun.star.lang.XServiceInfo, 
com.sun.star.task.XJobExecutor
 {
-try
+
+private PropertyValue[] m_wizardContext;
+
+/** The constructor of the inner class has a XMultiServiceFactory 
parameter.
+ * @param xmultiservicefactoryInitialization A special service factory
+ * could be introduced while initializing.
+ */
+public 
ReportWizardImplementation(com.sun.star.lang.XMultiServiceFactory 
xmultiservicefactoryInitialization)
 {
-if (sEvent.equals(PropertyNames.START))
+super();
+xmultiservicefactory = xmultiservicefactoryInitialization;
+}
+
+public void trigger(String sEvent)
+{
+try
 {
-if (!bWizardStartedAlready)
+if (sEvent.equals(PropertyNames.START))
 {
-ReportWizard CurReportWizard = new ReportWizard( 
xmultiservicefactory, m_wizardContext );
-CurReportWizard.startReportWizard();
+if (!bWizardstartedalready)
+{
+ReportWizard CurReportWizard = new ReportWizard( 
xmultiservicefactory, m_wizardContext );
+   

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 6 commits - sc/inc sc/qa sc/source

[Markus Mohrhard]

 sc/inc/stlsheet.hxx  |6 +---
 sc/qa/unit/ucalc.cxx |   55 +++
 sc/qa/unit/ucalc.hxx |4 ++
 sc/source/core/data/documen2.cxx |6 
 4 files changed, 61 insertions(+), 10 deletions(-)

New commits:
commit 8da96df8bfb225aa71a9c9fc6b11a63ec5a4dc28
Author: Markus Mohrhard 
Date:   Sun Sep 7 19:16:13 2014 +0200

add test for cond format copy&paste whole sheet

Conflicts:
sc/qa/unit/ucalc.cxx
sc/qa/unit/ucalc.hxx

Change-Id: I6e15bec2e1a2593b965df4c105758dc4bf22061f

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 73745e0..8386612 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4968,6 +4968,39 @@ void Test::testCondCopyPasteSheetBetweenDoc()
 m_pDoc->DeleteTab(0);
 }
 
+void Test::testCondCopyPasteSheet()
+{
+m_pDoc->InsertTab(0, "Test");
+
+ScConditionalFormat* pFormat = new ScConditionalFormat(1, m_pDoc);
+ScRange aCondFormatRange(0,0,0,3,3,0);
+ScRangeList aRangeList(aCondFormatRange);
+pFormat->AddRange(aRangeList);
+
+ScCondFormatEntry* pEntry = new 
ScCondFormatEntry(SC_COND_DIRECT,"=B2","",m_pDoc,ScAddress(0,0,0),ScGlobal::GetRscString(STR_STYLENAME_RESULT));
+pFormat->AddEntry(pEntry);
+m_pDoc->AddCondFormat(pFormat, 0);
+
+m_pDoc->CopyTab(0, SC_TAB_APPEND);
+
+ScConditionalFormatList* pList = m_pDoc->GetCondFormList(1);
+CPPUNIT_ASSERT_EQUAL(size_t(1), pList->size());
+
+ScConditionalFormat& rFormat = *pList->begin();
+const ScRangeList& rRange = rFormat.GetRange();
+CPPUNIT_ASSERT_EQUAL(ScRangeList(ScRange(0,0,1,3,3,1)), rRange);
+sal_uInt32 nKey = rFormat.GetKey();
+const SfxPoolItem* pItem = m_pDoc->GetAttr( 2, 2, 1, ATTR_CONDITIONAL );
+const ScCondFormatItem* pCondFormatItem = static_cast(pItem);
+
+CPPUNIT_ASSERT(pCondFormatItem);
+CPPUNIT_ASSERT_EQUAL(size_t(1), 
pCondFormatItem->GetCondFormatData().size());
+CPPUNIT_ASSERT( nKey == pCondFormatItem->GetCondFormatData().at(0) );
+
+m_pDoc->DeleteTab(1);
+m_pDoc->DeleteTab(0);
+}
+
 void Test::testMixData()
 {
 m_pDoc->InsertTab(0, "Test");
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index f2a2ba8..f6ede82 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -302,6 +302,7 @@ public:
 void testCondFormatInsertRow();
 void testCondFormatInsertCol();
 void testCondCopyPasteSheetBetweenDoc();
+void testCondCopyPasteSheet();
 
 CPPUNIT_TEST_SUITE(Test);
 #if CALC_TEST_PERF
@@ -414,6 +415,7 @@ public:
 CPPUNIT_TEST(testEditTextIterator);
 CPPUNIT_TEST(testCondFormatINSDEL);
 CPPUNIT_TEST(testCondCopyPasteSheetBetweenDoc);
+CPPUNIT_TEST(testCondCopyPasteSheet);
 CPPUNIT_TEST_SUITE_END();
 
 private:
commit 824ee35a3d4ed022ee1d7a181241934ab7b32993
Author: Markus Mohrhard 
Date:   Sun Sep 7 13:47:43 2014 +0200

rename the test

Conflicts:
sc/qa/unit/ucalc.hxx

Change-Id: I5c72782d90dbdaf1320f1685b530aed49ad80f18

diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 63787d8..73745e0 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -4946,7 +4946,7 @@ void Test::testCondFormatInsertRow()
 m_pDoc->DeleteTab(0);
 }
 
-void Test::testCopySheetCondFormat()
+void Test::testCondCopyPasteSheetBetweenDoc()
 {
 m_pDoc->InsertTab(0, "Test");
 
diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index f4a83e5..f2a2ba8 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -301,7 +301,7 @@ public:
 void testCondFormatINSDEL();
 void testCondFormatInsertRow();
 void testCondFormatInsertCol();
-void testCopySheetCondFormat();
+void testCondCopyPasteSheetBetweenDoc();
 
 CPPUNIT_TEST_SUITE(Test);
 #if CALC_TEST_PERF
@@ -413,7 +413,7 @@ public:
 CPPUNIT_TEST(testCellTextWidth);
 CPPUNIT_TEST(testEditTextIterator);
 CPPUNIT_TEST(testCondFormatINSDEL);
-CPPUNIT_TEST(testCopySheetCondFormat);
+CPPUNIT_TEST(testCondCopyPasteSheetBetweenDoc);
 CPPUNIT_TEST_SUITE_END();
 
 private:
commit 5ec1c2ab3590ffae6f7c63d538c3da33e822be5b
Author: Markus Mohrhard 
Date:   Sun Sep 7 13:43:33 2014 +0200

fix copy&paste of conditional format between sheets

Change-Id: I8856bff376f0f6e366062eddbc68a9eee098be5b

diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index f77452c..94b61df 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -914,10 +914,6 @@ bool ScDocument::CopyTab( SCTAB nOldPos, SCTAB nNewPos, 
const ScMarkData* pOnlyM
 maTabs[nOldPos]->StartAllListeners();
 maTabs[nNewPos]->StartAllListeners();
 
-ScConditionalFormatList* pNewList = new 
ScConditionalFormatList(*maTabs[nOldPos]->GetCondFormList());
-pNewList->UpdateReference(aRefCxt);
-maTabs[nNewPos]->SetCondFormList( pNewList );
-
 sc::SetFormulaDirtyContext aFormulaDirtyCxt;
 

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

[Matúš Kukan]

 sd/qa/unit/data/pptx/bnc480256.pptx |binary
 sd/qa/unit/import-tests.cxx |   48 
 2 files changed, 48 insertions(+)

New commits:
commit 5681725f1a2535a13b86104d8b8a33f750f34efc
Author: Matúš Kukan 
Date:   Tue Sep 9 13:19:27 2014 +0200

bnc#480256: OOXML import: unit test for table background property

Change-Id: I97bf0bd1ea8cf8ece30a2fa328c5c7a8b0549a4a

diff --git a/sd/qa/unit/data/pptx/bnc480256.pptx 
b/sd/qa/unit/data/pptx/bnc480256.pptx
new file mode 100755
index 000..71e91c2
Binary files /dev/null and b/sd/qa/unit/data/pptx/bnc480256.pptx differ
diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 259004c..f49d6aa 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -76,6 +76,7 @@ public:
 void testN862510_4();
 void testBnc870237();
 void testBnc887225();
+void testBnc480256();
 void testCreationDate();
 
 CPPUNIT_TEST_SUITE(SdFiltersTest);
@@ -97,6 +98,7 @@ public:
 CPPUNIT_TEST(testN862510_4);
 CPPUNIT_TEST(testBnc870237);
 CPPUNIT_TEST(testBnc887225);
+CPPUNIT_TEST(testBnc480256);
 CPPUNIT_TEST(testCreationDate);
 
 CPPUNIT_TEST_SUITE_END();
@@ -661,6 +663,52 @@ void SdFiltersTest::testBnc887225()
 xDocShRef->DoClose();
 }
 
+void SdFiltersTest::testBnc480256()
+{
+::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/pptx/bnc480256.pptx"), PPTX);
+// In the document, there are two tables with table background properties.
+// Make sure colors are set properly for individual cells.
+
+// TODO: If you are working on improving table background support, expect
+// this unit test to fail. In that case, feel free to change the numbers.
+
+SdDrawDocument *pDoc = xDocShRef->GetDoc();
+CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
+const SdrPage *pPage = pDoc->GetPage(1);
+CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL );
+
+sdr::table::SdrTableObj *pTableObj;
+uno::Reference< table::XCellRange > xTable;
+uno::Reference< beans::XPropertySet > xCell;
+sal_Int32 nColor;
+
+pTableObj = dynamic_cast(pPage->GetObj(0));
+CPPUNIT_ASSERT( pTableObj );
+xTable.set(pTableObj->getTable(), uno::UNO_QUERY_THROW);
+
+xCell.set(xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW);
+xCell->getPropertyValue("FillColor") >>= nColor;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(10208238), nColor);
+
+xCell.set(xTable->getCellByPosition(0, 1), uno::UNO_QUERY_THROW);
+xCell->getPropertyValue("FillColor") >>= nColor;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(13032959), nColor);
+
+pTableObj = dynamic_cast(pPage->GetObj(1));
+CPPUNIT_ASSERT( pTableObj );
+xTable.set(pTableObj->getTable(), uno::UNO_QUERY_THROW);
+
+xCell.set(xTable->getCellByPosition(0, 0), uno::UNO_QUERY_THROW);
+xCell->getPropertyValue("FillColor") >>= nColor;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(7056614), nColor);
+
+xCell.set(xTable->getCellByPosition(0, 1), uno::UNO_QUERY_THROW);
+xCell->getPropertyValue("FillColor") >>= nColor;
+CPPUNIT_ASSERT_EQUAL(sal_Int32(4626400), nColor);
+
+xDocShRef->DoClose();
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdFiltersTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - 2 commits - Makefile.in scp2/source

[Tor Lillqvist]

 Makefile.in  |1 +
 scp2/source/ooo/file_ooo.scp |4 
 2 files changed, 5 insertions(+)

New commits:
commit 24e57283d98b6dcbb98c8fb59c09eee511b1a7f9
Author: Tor Lillqvist 
Date:   Tue Sep 9 10:54:26 2014 +0300

No point in including ui-previewer in the end-user app bundle

Change-Id: Ib6aa559081af051db429206ef3e6a415542b84cb

diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 19916db..bb63013 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -135,6 +135,8 @@ File gid_File_Exe_Nsplugin
 End
 #endif
 
+#if !defined MACOSX
+
 File gid_File_Bin_UIPreviewer
 BIN_FILE_BODY;
 Dir = gid_Brand_Dir_Program;
@@ -146,6 +148,8 @@ File gid_File_Bin_UIPreviewer
   #endif
 End
 
+#endif
+
 #if defined UNX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE
 
 File gid_File_Script_Gengal
commit 6edc271641c3ca453b67296267b0cdd6ea2ab2ea
Author: Tor Lillqvist 
Date:   Tue Sep 9 10:35:51 2014 +0300

Remove potential old leftover before moving the app bundle

Change-Id: I7f0a8ae184a2f3d8a4476415b56df4ad8e4e342f

diff --git a/Makefile.in b/Makefile.in
index 4dd..f356208 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -298,6 +298,7 @@ endif
 
 mac-app-store-package: test-install
 ifneq ($(MACOSX_PACKAGE_SIGNING_IDENTITY),)
+   rm -rf "$(MACOSX_APP_NAME).app"
mv "$(TESTINSTALLDIR)/$(PRODUCTNAME).app" "$(MACOSX_APP_NAME).app"
productbuild --component "$(MACOSX_APP_NAME).app" /Applications --sign 
$(MACOSX_PACKAGE_SIGNING_IDENTITY) $(shell echo "$(MACOSX_APP_NAME)" | tr ' ' 
'-').pkg
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Noel Grandin]

 chart2/source/controller/dialogs/tp_AxisLabel.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7ad83656484db970a9539f0fd73c387cda15d40b
Author: Noel Grandin 
Date:   Tue Sep 9 12:30:56 2014 +0200

fix bitwise->logic conversion in SfxItemState commit

88a874fc "convert SfxItemState constants to a proper enum"

Change-Id: I979d5a859f0bbfd8797bfc5ba4ce5497eb777fe7

diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx 
b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 7a6cf63..3567639 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -153,7 +153,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs 
)
 bCheck = static_cast< const SfxBoolItem * >( pPoolItem 
)->GetValue();
 m_pCbShowDescription->Check( bCheck );
 
-if( aState != SFX_ITEM_DEFAULT )
+if( aState != SFX_ITEM_DEFAULT && aState != SFX_ITEM_SET)
 m_pCbShowDescription->Hide();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] convert SfxItemState constants to a proper enum

[Noel Grandin]

On 2014-09-05 11:44 AM, Stephan Bergmann wrote:

On 07/23/2014 01:26 PM, Noel Grandin wrote:

commit 88a874fcb3a3735634c638f34dcb0cc7bd2260ac
Author: Noel Grandin 
Date:   Wed Jul 23 10:48:58 2014 +0200

 convert SfxItemState constants to a proper enum

 and while we're at it
 - use the enum type all over the place instead of passing around
 sal_uInt16
 - don't use bitwise logic on enum values
 - use enum values instead of numeric constants

 Change-Id: I7f24cb4d242e1c00703e7bbcf1a00c18ef1e9fd4

diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx 
b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 14892aa..6bf9cab 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -153,7 +153,7 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs 
)
  bCheck = static_cast< const SfxBoolItem * >( pPoolItem 
)->GetValue();
  m_pCbShowDescription->Check( bCheck );

-if( ( aState & SFX_ITEM_DEFAULT ) == 0 )
+if( aState != SFX_ITEM_DEFAULT )
  m_pCbShowDescription->Hide();
  }



Is that change sound?  If e.g. aState is SFX_ITEM_SET (0x0030), the original condition was false while the new 
condition will be true.


Stephan




Thanks for finding this, fixed in commit 
7ad83656484db970a9539f0fd73c387cda15d40b


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: config_host/config_features.h.in config_host.mk.in configure.ac connectivity/Package_postgresql-sdbc.mk connectivity/source cppuhelper/source external/python3 instsetoo

[Tor Lillqvist]

 config_host.mk.in|1 
 config_host/config_features.h.in |   11 --
 configure.ac |   29 ---
 connectivity/Package_postgresql-sdbc.mk  |2 
 connectivity/source/drivers/postgresql/pq_connection.cxx |3 
 cppuhelper/source/paths.cxx  |2 
 external/python3/GeneratedPackage_python3.mk |2 
 instsetoo_native/CustomTarget_setup.mk   |   12 +--
 jurt/com/sun/star/lib/util/NativeLibraryLoader.java  |4 -
 jvmfwk/Package_jreproperties.mk  |2 
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx   |   12 ++-
 jvmfwk/source/fwkutil.hxx|2 
 pyuno/CustomTarget_python_shell.mk   |2 
 pyuno/source/module/pyuno_module.cxx |2 
 pyuno/source/module/pyuno_runtime.cxx|2 
 sal/rtl/bootstrap.cxx|2 
 scp2/InstallModule_base.mk   |1 
 scp2/InstallModule_calc.mk   |1 
 scp2/InstallModule_draw.mk   |1 
 scp2/InstallModule_graphicfilter.mk  |1 
 scp2/InstallModule_impress.mk|1 
 scp2/InstallModule_math.mk   |1 
 scp2/InstallModule_ooo.mk|1 
 scp2/InstallModule_python.mk |1 
 scp2/InstallModule_ure.mk|1 
 scp2/InstallModule_writer.mk |1 
 scp2/inc/macros.inc  |4 -
 scp2/source/base/postgresqlsdbc.scp  |2 
 scp2/source/ooo/common_brand.scp |   56 ++-
 scp2/source/ooo/directory_ooo.scp|   18 +---
 scp2/source/ooo/file_ooo.scp |2 
 scp2/source/ooo/ure.scp  |   37 +++--
 scp2/source/python/file_python.scp   |2 
 scp2/source/python/profileitem_python.scp|   12 ---
 setup_native/source/mac/CodesignRules.plist  |2 
 solenv/bin/macosx-change-install-names.pl|   14 +--
 tools/source/misc/extendapplicationenvironment.cxx   |2 
 ure/Package_install.mk   |4 -
 38 files changed, 72 insertions(+), 183 deletions(-)

New commits:
commit 6492c8576e0393f7ee548cd938e84c80e8d37127
Author: Tor Lillqvist 
Date:   Tue Sep 9 10:44:56 2014 +0300

Make the "Mac-like" or "canonical" app bundle structure always used on OS X

In other words, only executable files go in the MacOS folder. Dynamic
libraries and bundled frameworks (i.e., LibreOfficePython), and
nothing else, go in the Frameworks folder, and all other files go in
the Resources folder.

Especially, note that Java class files and rc (.ini) files also go in
Resources.

Such an app bundle structure is what Apple strongly suggests one
should use, and it has been hinted that future versions of code
signing and/or Gatekeeper will require such a structure.

There is still some ugliness thanks to traces of the historical
separation of URE from "the office". Like there are two separate
"unorc" files, one for URE, one for the LibreOffice application. IMHO,
this should be cleaned up, but is probably controversial.

(Eek! I now see there are actually *three* unorc files in the app
bundle. Not intentional. Need to fix that later.)

Change-Id: Idcf235038deb5b8e1d061734993e9f31869b7606

diff --git a/config_host.mk.in b/config_host.mk.in
index 22c8da5..1d8efeb 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -150,7 +150,6 @@ export ENABLE_LOCKDOWN=@ENABLE_LOCKDOWN@
 export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@
 export ENABLE_LTO=@ENABLE_LTO@
 export ENABLE_LWP=@ENABLE_LWP@
-export 
ENABLE_MACOSX_MACLIKE_APP_STRUCTURE=@ENABLE_MACOSX_MACLIKE_APP_STRUCTURE@
 export ENABLE_MACOSX_SANDBOX=@ENABLE_MACOSX_SANDBOX@
 export ENABLE_MEDIAWIKI=@ENABLE_MEDIAWIKI@
 export ENABLE_MARIADBC=@ENABLE_MARIADBC@
diff --git a/config_host/config_features.h.in b/config_host/config_features.h.in
index f87ee27..04dc7ba 100644
--- a/config_host/config_features.h.in
+++ b/config_host/config_features.h.in
@@ -107,17 +107,6 @@
 
 #define HAVE_FEATURE_MACOSX_SANDBOX 0
 
-/* MACOSX_MACLIKE_APP_STRUCTURE - LibreOffice.app substructure style
- *
- * Whether the structure of the LibreOffice.app bundle is more
- * "Mac-like" and what it has been previously, for instance with all
- * dylibs in the "Frameworks" folder and all non-code data in a the
- * "Resources" folder. For now coupled to HAVE_FEATURE_MACOSX_SANDBOX
- * in configure.ac.
- */
-
-#define HAVE_FEATURE

[Bug 46200] [RFE] Use the Scroll Lock key as a toggling lock key like Excel

[bugzilla-daemon]

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

je...@live.de changed:

   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

Re: [libreoffice] allow passing FilterOptions via cli

[Tomas Hlavaty]

Hi Stephan,

thank you for your reply.

I am asking because:

- The commit fixes two bugs:
  https://bugs.freedesktop.org/show_bug.cgi?id=47892
  and https://bugs.freedesktop.org/show_bug.cgi?id=36313

- The commit enables previously broken functionality
  in a very simple way.  The user interface could be more
  user friendly as you pointed out.  However, it is not clear
  how the user interface should be improved.  Also, anything
  more sophisticated would likely be significantly more
  complex change I think.  The commit finds a good balance
  with its simplicity & impact.

- At the moment, it is not possible to use LibreOffice command line
  to convert to and from text formats, because the FilterOptions
  is not available.  If users need to convert documents to and from
  text formats, they need to go via UNO.  However, there are
  problems when using UNO:

  - There is no way to guarantee that a UNO connection releases
 allocated memory.  Combined with memory leaks
 in LibreOffice, this makes it rather inconvenient when using
 it in a long running process.

  - UNO evolves, forcing us to follow the changes to
the protocol.  We can't simply use whatever the official
LibreOffice for a given system is, we have to use a particular
version.  On Linux, we use v3.5.

  - On Windows, we still use OpenOffice, because UNO
on LibreOffice does not properly close files, which combined
with the mandatory locking mis-feature on Windows is fatal.

- My prefered solution to our LibreOffice issues would be to
  to replace our dependency on UNO with simple command
  invocation.  This should solve our problems at the cost
  of slower conversions due to slow LibreOffice startup.
  That trade-off is reasonable I think.  There seems to be also
  general intention to improve LibreOffice startup in the future.

- The fix will be released in about half a year so I have to either:
 
  - wait and stick to the old LibreOffice and OpenOffice
for half a year;

  - build custom LibreOffice myself with the cherry-picked patch
which is doable on Linux, but rather complex on Windows;

  - ask for the fix to be put into v4.3 already; it is a bugfix
release after all

It would definitely help us to have the bugfix earlier then in v4.4.
It might also help the people who reported those bugs and it also
might help people, who might want to use FilterOptions but silently
give up when they find it broken.

Thank you very much!

Tomas

On 09/09/14 10:20, Stephan Bergmann wrote:
> On 09/08/2014 05:13 PM, Tomas Hlavaty wrote:
>> Sorry, I meant 4.3.3 as 4.3.2 is in freeze already.
>>
>> On 08/09/14 17:10, Tomas Hlavaty wrote:
>>> Hi all,
>>>
>>> would it be possible to cherry-pick
>>> http://cgit.freedesktop.org/libreoffice/core/commit/?id=45ba4d79d968f81f74ef0c4588fd15b1ce91153f
>>>
>>> to the 4.3.2 release?  It is currently commited towards 4.4 (scheduled
>>> for 2/2015) but as this is an old bug and 4.3.2 is called bugfix
>>> release, I wonder if it was be acceptable?
>
> Given "That is, I am not sure whether the fix from comment 16 is
> already a practical-enough solution?" at
> , I'm not sure
> whether it would actually help anybody to backport that to 4.3.3.
>
> Are you asking because you know about a specific scenario in which it
> would help, or just on generic "it's a bugfix, so it should go into a
> bugfix release" grounds?
>
> Stephan
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Bug 46200] [RFE] Use the Scroll Lock key as a toggling lock key like Excel

[bugzilla-daemon]

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

je...@live.de changed:

   What|Removed |Added

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

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

[Matúš Kukan]

 oox/source/drawingml/fillproperties.cxx|8 ++-
 oox/source/drawingml/table/tablebackgroundstylecontext.cxx |1 
 oox/source/drawingml/table/tablecell.cxx   |   34 +++--
 3 files changed, 37 insertions(+), 6 deletions(-)

New commits:
commit 43efd9b40d40b791a2c2deedcac36b99f7efb2cf
Author: Matúš Kukan 
Date:   Tue Sep 9 10:37:23 2014 +0200

bnc#480256: OOXML import: Respect table background properties a bit more

Only getBackgroundFillProperties() (fill) was used.
Use also getBackgroundFillStyleRef() (fillRef).
Also, do not replace table background color value with cell color,
we have to interpolate the two colors (if cell color is transparent).

Unfortunately, we don't use background table property in LibreOffice, so
this seems to be a best workaround.

Change-Id: I21bcc87a149c9f6d865ebee4012132ccc3a54af2

diff --git a/oox/source/drawingml/fillproperties.cxx 
b/oox/source/drawingml/fillproperties.cxx
index 83ab6a4..8401d7a 100644
--- a/oox/source/drawingml/fillproperties.cxx
+++ b/oox/source/drawingml/fillproperties.cxx
@@ -222,7 +222,13 @@ Color FillProperties::getBestSolidColor() const
 break;
 case XML_gradFill:
 if( !maGradientProps.maGradientStops.empty() )
-aSolidColor = maGradientProps.maGradientStops.begin()->second;
+{
+GradientFillProperties::GradientStopMap::const_iterator 
aGradientStop =
+maGradientProps.maGradientStops.begin();
+if (maGradientProps.maGradientStops.size() > 2)
+++aGradientStop;
+aSolidColor = aGradientStop->second;
+}
 break;
 case XML_pattFill:
 aSolidColor = maPatternProps.maPattBgColor.isUsed() ? 
maPatternProps.maPattBgColor : maPatternProps.maPattFgColor;
diff --git a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx 
b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
index a91da19..4e4cf3c 100644
--- a/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
+++ b/oox/source/drawingml/table/tablebackgroundstylecontext.cxx
@@ -34,6 +34,7 @@ TableBackgroundStyleContext::TableBackgroundStyleContext( 
ContextHandler2Helper&
 : ContextHandler2( rParent )
 , mrTableStyle( rTableStyle )
 {
+mrTableStyle.getBackgroundFillStyleRef().mnThemedIdx = 0;
 }
 
 TableBackgroundStyleContext::~TableBackgroundStyleContext()
diff --git a/oox/source/drawingml/table/tablecell.cxx 
b/oox/source/drawingml/table/tablecell.cxx
index 033434a..4053325 100644
--- a/oox/source/drawingml/table/tablecell.cxx
+++ b/oox/source/drawingml/table/tablecell.cxx
@@ -19,10 +19,13 @@
 
 #include "drawingml/table/tablecell.hxx"
 #include "drawingml/table/tableproperties.hxx"
+#include 
 #include "oox/drawingml/shapepropertymap.hxx"
 #include "oox/drawingml/textbody.hxx"
+#include "oox/drawingml/theme.hxx"
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/helper/propertyset.hxx"
+#include 
 #include 
 #include 
 #include 
@@ -99,7 +102,7 @@ void applyTableStylePart( oox::drawingml::FillProperties& 
rFillProperties,
   oox::drawingml::LineProperties& 
rBottomLeftToTopRightBorder,
   TableStylePart& rTableStylePart )
 {
-boost::shared_ptr< ::oox::drawingml::FillProperties >& 
rPartFillPropertiesPtr( rTableStylePart.getFillProperties() );
+::oox::drawingml::FillPropertiesPtr& rPartFillPropertiesPtr( 
rTableStylePart.getFillProperties() );
 if ( rPartFillPropertiesPtr.get() )
 rFillProperties.assignUsed( *rPartFillPropertiesPtr );
 
@@ -168,10 +171,6 @@ void TableCell::pushToXCell( const 
::oox::core::XmlFilterBase& rFilterBase, ::oo
 oox::drawingml::LineProperties aLinePropertiesTopLeftToBottomRight;
 oox::drawingml::LineProperties aLinePropertiesBottomLeftToTopRight;
 
-boost::shared_ptr< ::oox::drawingml::FillProperties >& 
rBackgroundFillPropertiesPtr( rTable.getBackgroundFillProperties() );
-if ( rBackgroundFillPropertiesPtr.get() )
-aFillProperties.assignUsed( *rBackgroundFillPropertiesPtr );
-
 applyTableStylePart( aFillProperties, aTextStyleProps,
 aLinePropertiesLeft,
 aLinePropertiesRight,
@@ -352,6 +351,31 @@ void TableCell::pushToXCell( const 
::oox::core::XmlFilterBase& rFilterBase, ::oo
 
 aFillProperties.assignUsed( maFillProperties );
 ShapePropertyMap aPropMap( rFilterBase.getModelObjectHelper() );
+
+Color aBgColor;
+sal_Int32 nPhClr = API_RGB_TRANSPARENT;
+boost::shared_ptr< ::oox::drawingml::FillProperties >& 
rBackgroundFillPropertiesPtr( rTable.getBackgroundFillProperties() );
+::oox::drawingml::ShapeStyleRef& rBackgroundFillStyle( 
rTable.getBackgroundFillStyleRef() );
+if (rBackgroundFillPropertiesPtr.get())
+aBgColor = rBackgroundFillPropertiesPtr->getBestSolidColor();
+else if (rBackgroundFillStyle.mnThemedIdx != 0)
+if (const Them

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

[Jennifer Liebel]

 sw/sdi/_grfsh.sdi |   12 
 sw/source/ui/app/mn.src   |1 +
 sw/source/uibase/shells/grfsh.cxx |3 +--
 3 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 24077ffc063990f9de11c6819432219a59d809f8
Author: Jennifer Liebel 
Date:   Tue Sep 2 12:40:20 2014 +

fdo#82496: Change picture option by rightclicking

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

diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index 15c00cc..2eb2ab2 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -62,6 +62,13 @@ interface BaseTextGraphic
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
 
+SID_CHANGE_PICTURE
+[
+ExecMethod = Execute ;
+StateMethod = GetAttrState ;
+DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
+]
+
 SID_EXTERNAL_EDIT
 [
 ExecMethod = Execute ;
@@ -224,6 +231,11 @@ interface BaseTextGraphic
 StateMethod = GetAttrState ;
 DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
 ]
+SID_CHANGE_PICTURE
+[
+ExecMethod = FuTemporary ;
+StateMethod = GetMenuState ;
+]
 SID_GRFFILTER_SOLARIZE  // status(final|play|rec)
 [
 ExecMethod = ExecAttr ;
diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src
index f62c8da..79b797d 100644
--- a/sw/source/ui/app/mn.src
+++ b/sw/source/ui/app/mn.src
@@ -1239,6 +1239,7 @@ Menu MN_GRF_POPUPMENU
 MN_FRM_CAPTION_ITEM
 SEPARATOR;
 MenuItem { ITEM_SAVE_GRAPHIC };
+MenuItem { ITEM_CHANGE_PICTURE };
 MenuItem { ITEM_COMPRESS_GRAPHIC };
 MenuItem { ITEM_EXTERNAL_EDIT };
 
diff --git a/sw/source/uibase/shells/grfsh.cxx 
b/sw/source/uibase/shells/grfsh.cxx
index d5ecec5..0e13b38 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -178,7 +178,6 @@ void SwGrfShell::Execute(SfxRequest &rReq)
 }
 }
 break;
-
 case SID_EXTERNAL_EDIT:
 {
 // When the graphic is selected to be opened via some external tool
@@ -191,7 +190,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
 }
 }
 break;
-
+case SID_CHANGE_PICTURE:
 case SID_INSERT_GRAPHIC:
 {
 // #i123922# implement slot independent from the two below to
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

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

New commits:
commit ddeed05299f842a8dffe509459602a57ef79
Author: Miklos Vajna 
Date:   Tue Sep 9 10:58:35 2014 +0200

Use boost::shared_ptr

Change-Id: I488accb1fb7588d6b91a8406d78f5897c12b3548

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 9a90ce7..a7a3185 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -207,7 +207,6 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_xInsertTextRange(xInsertTextRange),
 m_bIsNewDoc(bIsNewDoc),
 m_bInTableStyleRunProps(false),
-m_pSdtHelper(0),
 m_nTableDepth(0),
 m_bHasFtnSep(false),
 m_bIgnoreNextPara(false),
@@ -233,7 +232,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 getTableManager( ).startLevel();
 m_bUsingEnhancedFields = 
officecfg::Office::Common::Filter::Microsoft::Import::ImportWWFieldsAsEnhancedFields::get(m_xComponentContext);
 
-m_pSdtHelper = new SdtHelper(*this);
+m_pSdtHelper.reset(new SdtHelper(*this));
 
 m_aRedlines.push(std::vector());
 }
@@ -245,7 +244,6 @@ DomainMapper_Impl::~DomainMapper_Impl()
 RemoveLastParagraph( );
 getTableManager( ).endLevel();
 popTableManager( );
-delete m_pSdtHelper;
 }
 
 
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 4bee8ac..2376f3c 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -771,7 +771,7 @@ public:
 /// If we're inside , inside 
 bool m_bInTableStyleRunProps;
 
-SdtHelper* m_pSdtHelper;
+boost::shared_ptr m_pSdtHelper;
 
 /// Document background color, applied to every page style.
 boost::optional m_oBackgroundColor;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 include/vcl/menu.hxx   |   11 +-
 vcl/source/window/menu.cxx |   75 ++---
 2 files changed, 47 insertions(+), 39 deletions(-)

New commits:
commit e2e2b03b185639e72669b50b674e5feec5e706cd
Author: Jan Holesovsky 
Date:   Tue Sep 9 10:10:53 2014 +0200

vcl: Virtual functions do not work in constructors, avoid IsMenuBar() there.

Actually, this cleans this up further - Menu is an abstract class, so make 
its
constructor protected; which allows us to move the native menu construction
accordingly.

Change-Id: I774cf4ed0cd62b54074fa287d1a7192aced7efee

diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index 741ed21..98bf847 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -153,7 +153,6 @@ private:
 SalMenu*mpSalMenu;
 
 protected:
-SAL_DLLPRIVATE void ImplInit();
 SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
 SAL_DLLPRIVATE Menu*ImplGetStartMenu();
 SAL_DLLPRIVATE Menu*ImplFindSelectMenu();
@@ -203,8 +202,16 @@ public:
 SAL_DLLPRIVATE Window*  ImplGetWindow() const { return pWindow; }
 void ImplSelectWithStart( Menu* pStartMenu = NULL );
 
+protected:
+
+/** The Menu constructor is protected.
+
+The callers are supposed to instantiate either PopupMenu or MenuBar, but
+not a Menu directly.
+*/
+Menu();
+
 public:
-Menu();
 virtual ~Menu();
 
 virtual voidActivate();
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 56a1d5d..9e81810 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -111,8 +111,22 @@ static void ImplSetMenuItemData( MenuItemData* pData )
 }
 
 Menu::Menu()
+: mpFirstDel(NULL),
+  pItemList(new MenuItemList),
+  pLogo(NULL),
+  pStartedFrom(NULL),
+  pWindow(NULL),
+  nEventId(0),
+  mnHighlightedItemPos(ITEMPOS_INVALID),
+  nMenuFlags(0),
+  nDefaultItem(0),
+  nSelectedId(0),
+  bCanceled(false),
+  bInCallback(false),
+  bKilled(false),
+  mpLayoutData(NULL),
+  mpSalMenu(NULL)
 {
-ImplInit();
 }
 
 Menu::~Menu()
@@ -161,27 +175,6 @@ Menu::~Menu()
 ImplSetSalMenu( NULL );
 }
 
-void Menu::ImplInit()
-{
-mnHighlightedItemPos = ITEMPOS_INVALID;
-mpSalMenu   = NULL;
-nMenuFlags  = 0;
-nDefaultItem= 0;
-nSelectedId = 0;
-pItemList   = new MenuItemList;
-pLogo   = NULL;
-pStartedFrom= NULL;
-pWindow = NULL;
-nEventId= 0;
-bCanceled   = false;
-bInCallback = false;
-bKilled = false;
-mpLayoutData= NULL;
-mpFirstDel  = NULL; // Dtor notification list
-// Native-support: returns NULL if not supported
-mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(IsMenuBar(), this);
-}
-
 void Menu::ImplLoadRes( const ResId& rResId )
 {
 ResMgr* pMgr = rResId.GetResMgr();
@@ -2472,21 +2465,25 @@ void Menu::HighlightItem( sal_uInt16 nItemPos )
 
 // - MenuBar -
 
-MenuBar::MenuBar() : Menu()
+MenuBar::MenuBar()
+: Menu(),
+  mbCloserVisible(false),
+  mbFloatBtnVisible(false),
+  mbHideBtnVisible(false),
+  mbDisplayable(true)
 {
-mbDisplayable   = true;
-mbCloserVisible = false;
-mbFloatBtnVisible   = false;
-mbHideBtnVisible= false;
+mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(true, this);
 }
 
-MenuBar::MenuBar( const MenuBar& rMenu ) : Menu()
+MenuBar::MenuBar( const MenuBar& rMenu )
+: Menu(),
+  mbCloserVisible(false),
+  mbFloatBtnVisible(false),
+  mbHideBtnVisible(false),
+  mbDisplayable(true)
 {
-mbDisplayable   = true;
-mbCloserVisible = false;
-mbFloatBtnVisible   = false;
-mbHideBtnVisible= false;
-*this   = rMenu;
+mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(true, this);
+*this = rMenu;
 }
 
 MenuBar::~MenuBar()
@@ -2694,19 +2691,23 @@ bool MenuBar::HandleMenuButtonEvent( Menu *, sal_uInt16 
i_nButtonId ) const
 // bool PopupMenu::bAnyPopupInExecute = false;
 
 PopupMenu::PopupMenu()
+: pRefAutoSubMenu(NULL)
 {
-pRefAutoSubMenu = NULL;
+mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(false, this);
 }
 
 PopupMenu::PopupMenu( const ResId& rResId )
+: pRefAutoSubMenu(NULL)
 {
-pRefAutoSubMenu = NULL;
+mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(false, this);
 ImplLoadRes( rResId );
 }
 
-PopupMenu::PopupMenu( const PopupMenu& rMenu ) : Menu()
+PopupMenu::PopupMenu( const PopupMenu& rMenu )
+: Menu(),
+  pRefAutoSubMenu(NULL)
 {
-pRefAutoSubMenu = NULL;
+mpSalMenu = ImplGetSVData()->mpDefInst->CreateMenu(false, this);
 *this = rMenu;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedeskto

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

[Heena Gupta]

 sw/qa/extras/ooxmlexport/data/fdo83428.docx |binary
 sw/qa/extras/ooxmlexport/ooxmlexport.cxx|9 +
 2 files changed, 9 insertions(+)

New commits:
commit 2be527134fc132fcb6d294b1863823064282f061
Author: Heena Gupta 
Date:   Tue Sep 9 11:25:04 2014 +0530

fdo#83428 Add test case for custom property dropped in docx

Reviewed on:
https://gerrit.libreoffice.org/11346

Change-Id: I8afc0ae1351b4c8bb25f864040b99832b1bed3c1

diff --git a/sw/qa/extras/ooxmlexport/data/fdo83428.docx 
b/sw/qa/extras/ooxmlexport/data/fdo83428.docx
new file mode 100644
index 000..9e9743a
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/fdo83428.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 3cda4ce..de91ec1 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -210,6 +210,15 @@ DECLARE_OOXMLEXPORT_TEST(testFDO83044, "fdo83044.docx")
 
 assertXPath(pXmlDoc, "/w:document/w:body/w:sdt/w:sdtPr/w:text", 1);
 }
+
+DECLARE_OOXMLEXPORT_TEST(testfdo83428, "fdo83428.docx")
+{
+ uno::Reference 
xDocumentPropertiesSupplier(mxComponent, uno::UNO_QUERY);
+ uno::Reference 
xProps(xDocumentPropertiesSupplier->getDocumentProperties());
+ uno::Reference 
xUDProps(xProps->getUserDefinedProperties(), uno::UNO_QUERY);
+ CPPUNIT_ASSERT_EQUAL(OUString("Document"), 
getProperty(xUDProps, "Testing"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: lo-daily.git is moved

[Miklos Vajna]

On Tue, Sep 09, 2014 at 10:38:14AM +0200, Miklos Vajna 
 wrote:
> are not on TDF infra, and also you no longer need to register, there is

not -> now :)


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

Sudarshan K (a.k.a Sudarshan18) License statement.

[Sudarshan Rao]

All of my past & future contributions to LibreOffice may be
   licensed under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Adolfo Jayme Barrientos]

 cui/uiconfig/ui/colorpickerdialog.ui |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 42a767dc196ca695dbcc9163f3175518086e97b1
Author: Adolfo Jayme Barrientos 
Date:   Sun Sep 7 14:44:12 2014 -0500

semibold -> bold in Color Picker headings

Change-Id: Ibd591ff43b0128eb8d7fb80468eb38ae68d187b2
Reviewed-on: https://gerrit.libreoffice.org/11328
Reviewed-by: Samuel Mehrbrodt 
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/cui/uiconfig/ui/colorpickerdialog.ui 
b/cui/uiconfig/ui/colorpickerdialog.ui
index 2567d53..16f8260 100644
--- a/cui/uiconfig/ui/colorpickerdialog.ui
+++ b/cui/uiconfig/ui/colorpickerdialog.ui
@@ -385,7 +385,7 @@
 False
 RGB
 
-  
+  
 
   
 
@@ -530,7 +530,7 @@
 False
 HSB
 
-  
+  
 
   
 
@@ -697,7 +697,7 @@
 False
 CMYK
 
-  
+  
 
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

lo-daily.git is moved

[Miklos Vajna]

Hi,

If you previously used 
for libreoffice-4-3..master (Linux, dbgutil) bibisecting, then please
update the URL in your .git/config, the new one is
.

Today's daily build is available only at the new location.

With this, I'm no longer abusing bitbucket with the multi-GB repos, they
are not on TDF infra, and also you no longer need to register, there is
plain git:// access.

I've updated

accordingly, ideally that was the only place that referenced the old
URL.

Regards,

Miklos


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

[Libreoffice-commits] core.git: external/collada2gltf

[Peter Foley]

 external/collada2gltf/StaticLibrary_collada2gltf.mk |4 
 1 file changed, 4 insertions(+)

New commits:
commit 666b9fb19d59480130d92f6272346608d5e52e09
Author: Peter Foley 
Date:   Mon Sep 8 14:52:35 2014 -0400

Hide warning spam from collada2gltf

Change-Id: Id772a8f4ca9f46f8a36dede759495e06c8e43732
Reviewed-on: https://gerrit.libreoffice.org/11343
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/external/collada2gltf/StaticLibrary_collada2gltf.mk 
b/external/collada2gltf/StaticLibrary_collada2gltf.mk
index a25f63d..2d1048d 100644
--- a/external/collada2gltf/StaticLibrary_collada2gltf.mk
+++ b/external/collada2gltf/StaticLibrary_collada2gltf.mk
@@ -22,6 +22,10 @@ $(eval $(call gb_StaticLibrary_add_defs,collada2gltf,\
-DUSE_OPEN3DGC \
 ))
 
+# collada2gltf has a lot of warnings, suppress them.
+$(eval $(call gb_StaticLibrary_add_cxxflags,collada2gltf,\
+   -w \
+))
 ifeq ($(COM),MSC)
 $(eval $(call gb_StaticLibrary_add_defs,collada2gltf,\
-D_CRT_SECURE_NO_WARNINGS \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Makefile.in solenv/gbuild

[Peter Foley]

 Makefile.in   |   11 +++
 solenv/gbuild/gbuild.help.txt |1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 7abf6861f96052de3b04424ba64b4ee07de35348
Author: Peter Foley 
Date:   Mon Sep 8 14:52:03 2014 -0400

Fix help and showmodules build targets

Change-Id: I096798159f4d3d59306be1b3843de1daca280f7a
Reviewed-on: https://gerrit.libreoffice.org/11342
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/Makefile.in b/Makefile.in
index 73da088..94d9945 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -9,13 +9,13 @@
 
 gb_Top_MODULE_CHECK_TARGETS := slowcheck unitcheck subsequentcheck perfcheck
 
-.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check 
clean clean-build clean-host test-install distclean distro-pack-install docs 
download fetch findunusedcode get-submodules id install install-strip tags 
debugrun help translations packageinfo internal.clean 
$(gb_Top_MODULE_CHECK_TARGETS)
+.PHONY : all bootstrap gbuild build build-non-l10n-only build-l10n-only check 
clean clean-build clean-host test-install distclean distro-pack-install docs 
download fetch findunusedcode get-submodules id install install-strip tags 
debugrun help showmodules translations packageinfo internal.clean 
$(gb_Top_MODULE_CHECK_TARGETS)
 
 MAKECMDGOALS?=all
 build_goal:=$(if $(filter build check,$(MAKECMDGOALS)),all)\
  $(if $(filter build-nocheck,$(MAKECMDGOALS)),build)\
  $(if $(filter check,$(MAKECMDGOALS)),subsequentcheck)\
- $(filter all build-l10n-only build-non-l10n-only debugrun help translations 
$(gb_Top_MODULE_CHECK_TARGETS) check packageinfo,$(MAKECMDGOALS))
+ $(filter all build-l10n-only build-non-l10n-only debugrun help showmodules 
translations $(gb_Top_MODULE_CHECK_TARGETS) check packageinfo,$(MAKECMDGOALS))
 
 SHELL := @SHELL_BASH@
 SRCDIR := @SRC_ROOT@
@@ -29,7 +29,7 @@ GIT_BUILD := $(if $(wildcard $(SRCDIR)/.git),T)
 #think packagers would ever want that. I certainly do not.)
 # 2. if we are making help, clean or distclean, because they do not
 #need updated configuration
-ifeq (,$(MAKE_RESTARTS)$(if $(GIT_BUILD),,T)$(if $(filter-out help clean 
distclean,$(MAKECMDGOALS)),,T))
+ifeq (,$(MAKE_RESTARTS)$(if $(GIT_BUILD),,T)$(if $(filter-out help showmodules 
clean distclean,$(MAKECMDGOALS)),,T))
 
 .PHONY : force-restart
 Makefile: $(BUILDDIR)/config_host.mk force-restart
@@ -235,7 +235,10 @@ ifeq ($(OS),IOS)
$(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) ios
 endif
 
-build-non-l10n-only build-l10n-only build-nocheck check debugrun help 
translations packageinfo $(gb_Top_MODULE_CHECK_TARGETS): build
+build-non-l10n-only build-l10n-only build-nocheck check debugrun translations 
packageinfo $(gb_Top_MODULE_CHECK_TARGETS): build
+
+help showmodules:
+   $(MAKE) $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild $@
 
 cross-toolset: bootstrap fetch
$(MAKE) gb_Side=build $(PARALLELISM_OPTION) $(GMAKE_OPTIONS) -f 
$(SRCDIR)/Makefile.gbuild build-tools
diff --git a/solenv/gbuild/gbuild.help.txt b/solenv/gbuild/gbuild.help.txt
index 4831e71..986c910 100644
--- a/solenv/gbuild/gbuild.help.txt
+++ b/solenv/gbuild/gbuild.help.txt
@@ -39,6 +39,7 @@ AVAILABLE TARGETS
 against it
dump-deps-pngcreates dependency diagrams in PNG format
 NOTE: needs graphviz to work
+   showmodules  shows all registered modules
 build the named module
.check   run unittests of the named module
.clean   clean the named module
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 75757] remove inheritance to std::map and std::vector

[bugzilla-daemon]

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

--- Comment #31 from Commit Notification 
 ---
Takeshi Abe committed a patch related to this issue.
It has been pushed to "master":

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

fdo#75757: remove inheritance to std::vector



The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds
Affected users are encouraged to test the fix and report feedback.

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

[Andras Timar]

 sc/inc/sc.hrc  |6 ++
 sc/source/ui/dialogs/searchresults.cxx |3 ++-
 sc/source/ui/src/scstring.src  |   15 +++
 3 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 5390946c8651bfae8b88e2e9f2a286bcd5fbdf3b
Author: Andras Timar 
Date:   Tue Sep 9 09:47:25 2014 +0200

fdo#80098 make header of Search Result dialog localizable

Change-Id: I16ec29e4f35f00e39d88dd334284db7bf051a846

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index db71dbe..420d149 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -915,6 +915,12 @@
 #define SCSTR_PRINT_OPTIONS (STR_START + 216)
 #define SCSTR_WARN_ME_IN_FUTURE_CHECK   (STR_START + 217)
 
+// header of search result dialog
+
+#define STR_SHEET   (STR_START + 218)
+#define STR_CELL(STR_START + 219)
+#define STR_CONTENT (STR_START + 220)
+
 // navigator - in the same order as SC_CONTENT_...
 #define SCSTR_CONTENT_ROOT  (STR_START + 250)
 #define SCSTR_CONTENT_TABLE (STR_START + 251)
diff --git a/sc/source/ui/dialogs/searchresults.cxx 
b/sc/source/ui/dialogs/searchresults.cxx
index 26471ba..ba6e8dd 100644
--- a/sc/source/ui/dialogs/searchresults.cxx
+++ b/sc/source/ui/dialogs/searchresults.cxx
@@ -18,6 +18,7 @@
 #include "rangeutl.hxx"
 #include "tabvwsh.hxx"
 #include 
+#include "scresid.hxx"
 
 namespace sc {
 
@@ -34,7 +35,7 @@ SearchResultsDlg::SearchResultsDlg( SfxBindings* _pBindings, 
Window* pParent, sa
 mpList = new SvSimpleTable(*pContainer);
 long nTabs[] = {3, 0, 40, 60};
 mpList->SetTabs(&nTabs[0]);
-mpList->InsertHeaderEntry("Sheet\tCell\tContent");
+mpList->InsertHeaderEntry(SC_RESSTR(STR_SHEET) + "\t" + 
SC_RESSTR(STR_CELL) + "\t" + SC_RESSTR(STR_CONTENT));
 mpList->SetSelectHdl( LINK(this, SearchResultsDlg, ListSelectHdl) );
 }
 
diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src
index cc07d2c..ffa400b 100644
--- a/sc/source/ui/src/scstring.src
+++ b/sc/source/ui/src/scstring.src
@@ -967,4 +967,19 @@ String STR_SUM
 Text [ en-US ] = "Total" ;
 };
 
+String STR_SHEET
+{
+Text [ en-US ] = "Sheet" ;
+};
+
+String STR_CELL
+{
+Text [ en-US ] = "Cell" ;
+};
+
+String STR_CONTENT
+{
+Text [ en-US ] = "Content" ;
+};
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 dbaccess/source/ui/querydesign/querydlg.cxx |5 +
 dbaccess/uiconfig/ui/joindialog.ui  |1 +
 2 files changed, 6 insertions(+)

New commits:
commit a3de6b662444bafd3b102b6991866ed4c7206965
Author: Caolán McNamara 
Date:   Mon Sep 8 15:49:24 2014 +0100

Resolves: fdo#83501 STR_QUERY_* populate the join dialog

(cherry picked from commit 3fc1e691c5e14f3b7a2579b563188e814f731cf6)

Change-Id: Id4cff969297009c9f9cd3323ac01c743b29ca6c4
Reviewed-on: https://gerrit.libreoffice.org/11340
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx 
b/dbaccess/source/ui/querydesign/querydlg.cxx
index b655a9b..23db605 100644
--- a/dbaccess/source/ui/querydesign/querydlg.cxx
+++ b/dbaccess/source/ui/querydesign/querydlg.cxx
@@ -55,6 +55,11 @@ DlgQryJoin::DlgQryJoin( OQueryTableView * pParent,
 , m_xConnection(_xConnection)
 {
 get(m_pML_HelpText, "helptext");
+Size aSize(LogicToPixel(Size(179, 49), MAP_APPFONT));
+//alternatively loop through the STR_QUERY_* strings with their 
STR_JOIN_TYPE_HINT
+//suffix to find the longest entry at runtime
+m_pML_HelpText->set_height_request(aSize.Height());
+m_pML_HelpText->set_width_request(aSize.Width());
 get(m_pLB_JoinType, "type");
 get(m_pCBNatural, "natural");
 get(m_pPB_OK, "ok");
diff --git a/dbaccess/uiconfig/ui/joindialog.ui 
b/dbaccess/uiconfig/ui/joindialog.ui
index 650fc44..7be2283 100644
--- a/dbaccess/uiconfig/ui/joindialog.ui
+++ b/dbaccess/uiconfig/ui/joindialog.ui
@@ -167,6 +167,7 @@
 True
 False
 0
+0
 True
 48
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Takeshi Abe]

 sc/source/filter/inc/addressconverter.hxx |   10 --
 sc/source/filter/oox/addressconverter.cxx |6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit c45be916f63477e7cd8b0fe54fd6935acf1526e4
Author: Takeshi Abe 
Date:   Mon Sep 8 19:05:35 2014 +0900

fdo#75757: remove inheritance to std::vector

from BinRangeList.

Change-Id: Ibfffceb583dc8a9c849aa4fd3eff56d73bcd5452
Reviewed-on: https://gerrit.libreoffice.org/11336
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/sc/source/filter/inc/addressconverter.hxx 
b/sc/source/filter/inc/addressconverter.hxx
index d7919bc..5afec56 100644
--- a/sc/source/filter/inc/addressconverter.hxx
+++ b/sc/source/filter/inc/addressconverter.hxx
@@ -135,12 +135,18 @@ inline BiffInputStream& operator>>( BiffInputStream& 
rStrm, BinRange& orRange )
 }
 
 /** A 2D cell range address list for binary filters. */
-class BinRangeList : public ::std::vector< BinRange >
+class BinRangeList
 {
 public:
-inline explicit BinRangeList() {}
+inline explicit BinRangeList() : mvRanges() {}
+
+::std::vector< BinRange >::const_iterator begin() const { return 
mvRanges.begin(); }
+::std::vector< BinRange >::const_iterator end() const { return 
mvRanges.end(); }
 
 voidread( SequenceInputStream& rStrm );
+
+private:
+::std::vector< BinRange > mvRanges;
 };
 
 inline SequenceInputStream& operator>>( SequenceInputStream& rStrm, 
BinRangeList& orRanges )
diff --git a/sc/source/filter/oox/addressconverter.cxx 
b/sc/source/filter/oox/addressconverter.cxx
index 20f4f74..22e1632 100644
--- a/sc/source/filter/oox/addressconverter.cxx
+++ b/sc/source/filter/oox/addressconverter.cxx
@@ -101,8 +101,8 @@ void BinRange::read( BiffInputStream& rStrm, bool 
bCol16Bit, bool bRow32Bit )
 void BinRangeList::read( SequenceInputStream& rStrm )
 {
 sal_Int32 nCount = rStrm.readInt32();
-resize( getLimitedValue< size_t, sal_Int64 >( nCount, 0, 
rStrm.getRemaining() / 16 ) );
-for( iterator aIt = begin(), aEnd = end(); aIt != aEnd; ++aIt )
+mvRanges.resize( getLimitedValue< size_t, sal_Int64 >( nCount, 0, 
rStrm.getRemaining() / 16 ) );
+for( ::std::vector< BinRange >::iterator aIt = mvRanges.begin(), aEnd = 
mvRanges.end(); aIt != aEnd; ++aIt )
 aIt->read( rStrm );
 }
 
@@ -478,7 +478,7 @@ void AddressConverter::convertToCellRangeList( 
ApiCellRangeList& orRanges,
 const BinRangeList& rBinRanges, sal_Int16 nSheet, bool bTrackOverflow )
 {
 CellRangeAddress aRange;
-for( BinRangeList::const_iterator aIt = rBinRanges.begin(), aEnd = 
rBinRanges.end(); aIt != aEnd; ++aIt )
+for( ::std::vector< BinRange >::const_iterator aIt = rBinRanges.begin(), 
aEnd = rBinRanges.end(); aIt != aEnd; ++aIt )
 if( convertToCellRange( aRange, *aIt, nSheet, true, bTrackOverflow ) )
 orRanges.push_back( aRange );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [libreoffice] allow passing FilterOptions via cli

[Stephan Bergmann]

On 09/08/2014 05:13 PM, Tomas Hlavaty wrote:

Sorry, I meant 4.3.3 as 4.3.2 is in freeze already.

On 08/09/14 17:10, Tomas Hlavaty wrote:

Hi all,

would it be possible to cherry-pick
http://cgit.freedesktop.org/libreoffice/core/commit/?id=45ba4d79d968f81f74ef0c4588fd15b1ce91153f
to the 4.3.2 release?  It is currently commited towards 4.4 (scheduled
for 2/2015) but as this is an old bug and 4.3.2 is called bugfix
release, I wonder if it was be acceptable?


Given "That is, I am not sure whether the fix from comment 16 is already 
a practical-enough solution?" at 
, I'm not sure 
whether it would actually help anybody to backport that to 4.3.3.


Are you asking because you know about a specific scenario in which it 
would help, or just on generic "it's a bugfix, so it should go into a 
bugfix release" grounds?


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