Re: [RFC} running a formatter over the Java code

[Stephan Bergmann]

On 08/05/2014 10:26 AM, Noel Grandin wrote:

Would there be any objections to my running a formatter over the
existing Java LO code (with the exception of the newer Android stuff) ?

Because at the moment
- it has very little consistency
- and it appears that at some point in time a tabs-to-spaces conversion
was done, but not all the files followed the same tab-size convention,
so some of the formatting is now REALLY out.


With no mechanism in place to automatically enforce a specific 
formatting algorithm, code formatted according to that algorithm will 
over time start to deviate from it again, anyway.  Hence, for already 
well-formatted code, arguably the only effect of such a reformatting is 
to make it harder to trace through the git history.


Therefore, an alternative approach could be to do a mass reformatting 
only for code that would truly benefit from it, like code whose broken 
tabs/spaces indentation has made it become "REALLY out" by now.  That 
would of course be a more laborious commit than a wholesale modification 
of all *.java files.


Or maybe I'm exaggerating the negative impact on browsing the git 
history, but that is at least what I feel after many a uses of git blame.


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

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

[Michael Stahl]

 vcl/source/fontsubset/cff.cxx |   18 +-
 1 file changed, 13 insertions(+), 5 deletions(-)

New commits:
commit 51acd019a038e0b69490290d4808ec49c7c27ba7
Author: Michael Stahl 
Date:   Tue Aug 5 12:50:05 2014 +0200

fdo#81516: vcl: limit number of CFFs read from font

Change-Id: I9928b9805169a2dbb41be669dc37617b30bc672b
(cherry picked from commit 45b0b47d114437198c9e0872d427576e6e7e6cc6)
Reviewed-on: https://gerrit.libreoffice.org/10751
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/vcl/source/fontsubset/cff.cxx b/vcl/source/fontsubset/cff.cxx
index 0b40ff5..5f6f2ef 100644
--- a/vcl/source/fontsubset/cff.cxx
+++ b/vcl/source/fontsubset/cff.cxx
@@ -325,7 +325,7 @@ public:
 explicit CffSubsetterContext( const U8* pBasePtr, int nBaseLen);
 ~CffSubsetterContext( void);
 
-voidinitialCffRead( void);
+boolinitialCffRead();
 boolemitAsType1( class Type1Emitter&,
 const sal_GlyphId* pGlyphIds, const U8* pEncoding,
 GlyphWidth* pGlyphWidths, int nGlyphCount, FontSubsetInfo& );
@@ -1443,7 +1443,7 @@ CffGlobal::CffGlobal( void)
 // TODO; maFontMatrix.clear();
 }
 
-void CffSubsetterContext::initialCffRead( void)
+bool CffSubsetterContext::initialCffRead()
 {
 // get the CFFHeader
 mpReadPtr = mpBasePtr;
@@ -1501,7 +1501,11 @@ void CffSubsetterContext::initialCffRead( void)
 //  assert( mnFontDictBase == tellRel());
 mpReadPtr = mpBasePtr + mnFontDictBase;
 mnFDAryCount = (mpReadPtr[0]<<8) + mpReadPtr[1];
-assert( mnFDAryCount < (int)(sizeof(maCffLocal)/sizeof(*maCffLocal)));
+if (static_cast(mnFDAryCount) >= SAL_N_ELEMENTS(maCffLocal))
+{
+SAL_INFO("vcl.fonts", "CffSubsetterContext: too many CFF in font");
+return false;
+}
 
 // read FDArray details to get access to the PRIVDICTs
 for( int i = 0; i < mnFDAryCount; ++i) {
@@ -1542,6 +1546,8 @@ void CffSubsetterContext::initialCffRead( void)
 }
 
 // ignore the Notices info
+
+return true;
 }
 
 // get a cstring from a StringID
@@ -2176,14 +2182,16 @@ bool CffSubsetterContext::emitAsType1( Type1Emitter& 
rEmitter,
 bool FontSubsetInfo::CreateFontSubsetFromCff( GlyphWidth* pOutGlyphWidths )
 {
 CffSubsetterContext aCff( mpInFontBytes, mnInByteLength);
-aCff.initialCffRead();
+bool bRC = aCff.initialCffRead();
+if (!bRC)
+return bRC;
 
 // emit Type1 subset from the CFF input
 // TODO: also support CFF->CFF subsetting (when PDF-export and PS-printing 
need it)
 const bool bPfbSubset = (0 != (mnReqFontTypeMask & 
FontSubsetInfo::TYPE1_PFB));
 Type1Emitter aType1Emitter( mpOutFile, bPfbSubset);
 aType1Emitter.setSubsetName( mpReqFontName);
-bool bRC = aCff.emitAsType1( aType1Emitter,
+bRC = aCff.emitAsType1( aType1Emitter,
 mpReqGlyphIds, mpReqEncodedIds,
 pOutGlyphWidths, mnReqGlyphCount, *this);
 return bRC;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 test/source/diff/diff.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit eacd4c044f2bdec41b02e3832772c65327e5be57
Author: Stephan Bergmann 
Date:   Wed Aug 6 10:09:50 2014 +0200

Improve test failure output

Change-Id: I4417318988ef70639cbcec9d776c783ad69c3990

diff --git a/test/source/diff/diff.cxx b/test/source/diff/diff.cxx
index 004a0e5..80b6704 100644
--- a/test/source/diff/diff.cxx
+++ b/test/source/diff/diff.cxx
@@ -90,7 +90,7 @@ private:
 void cppunitAssertEqual(const xmlChar *expected, const xmlChar *found);
 
 /// Error message for cppunit that prints out when expected and found are 
not equal - for doubles.
-void cppunitAssertEqualDouble(const xmlChar *node, double expected, double 
found, double delta);
+void cppunitAssertEqualDouble(const xmlNodePtr node, const xmlAttrPtr 
attr, double expected, double found, double delta);
 
 ToleranceContainer toleranceContainer;
 xmlDocPtr xmlFile1;
@@ -260,11 +260,13 @@ void XMLDiff::cppunitAssertEqual(const xmlChar *expected, 
const xmlChar *found)
 #endif
 }
 
-void XMLDiff::cppunitAssertEqualDouble(const xmlChar *node, double expected, 
double found, double delta)
+void XMLDiff::cppunitAssertEqualDouble(const xmlNodePtr node, const xmlAttrPtr 
attr, double expected, double found, double delta)
 {
 #if USE_CPPUNIT
+xmlChar * path = xmlGetNodePath(node);
 std::stringstream stringStream;
-stringStream << "Reference: " << fileName << "\n- Node: " << (const char*) 
node;
+stringStream << "Reference: " << fileName << "\n- Node: " << (const char*) 
path << "\n- Attr: " << (const char*) attr->name;
+xmlFree(path);
 
 CPPUNIT_ASSERT_DOUBLES_EQUAL_MESSAGE(stringStream.str(), expected, found, 
delta);
 #endif
@@ -334,7 +336,7 @@ bool XMLDiff::compareAttributes(xmlNodePtr node1, 
xmlNodePtr node2)
 else
 {
 #if USE_CPPUNIT
-cppunitAssertEqualDouble(attr1->name, dVal1, dVal2, 1e-08);
+cppunitAssertEqualDouble(node1, attr1, dVal1, dVal2, 1e-08);
 #else
 if (dVal1 != dVal2)
 return false;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/source include/svx svx/source

[Thomas Arnhold]

 cui/source/inc/cuires.hrc |   17 -
 include/svx/dialogs.hrc   |   33 -
 svx/source/src/app.hrc|   33 -
 3 files changed, 83 deletions(-)

New commits:
commit 48ccd80566d18ef0305381d7b4ed68fdaf032948
Author: Thomas Arnhold 
Date:   Wed Aug 6 10:11:01 2014 +0200

remove some more unused resource ids

Change-Id: Ife159630b7e68e8e346619853b8285f46dcf275b

diff --git a/cui/source/inc/cuires.hrc b/cui/source/inc/cuires.hrc
index 176e7fd..03b5d61 100644
--- a/cui/source/inc/cuires.hrc
+++ b/cui/source/inc/cuires.hrc
@@ -96,7 +96,6 @@
 
 // options
 #define RID_SVXSTR_DIAGRAM_ROW  (RID_SVX_START + 
1162)
-#define RID_OFAPAGE_CONNPOOLOPTIONS (RID_OFA_START + 122)
 #define QUERY_DELETE_CONFIRM(RID_SVX_START + 1110)
 #define RID_SVXPAGE_JSEARCH_OPTIONS (RID_SVX_START +  840)
 #define STR_LINKEDDOC_DOESNOTEXIST  (RID_SVX_START + )
@@ -112,7 +111,6 @@
 #define RID_RIDER_SLL_PERSONAL  (RID_OFA_START + 101)//?
 
 // options
-#define RID_SVXDLG_SECURITY_OPTIONS (RID_SVX_START + 300)
 #define RID_SVXPAGE_ONLINEUPDATE(RID_SVX_START + 298)
 #define OFA_TP_MEMORY   (RID_OFA_START + 250)
 #define RID_SVXPAGE_INET_SECURITY   (RID_SVX_START + 200)
@@ -123,11 +121,9 @@
 #define OFA_TP_LANGUAGES(RID_OFA_START + 205)
 #define OFA_TP_MISC (RID_OFA_START + 200)
 #define OFA_TP_VIEW (RID_OFA_START + 202)
-#define RID_OFAPAGE_MSFILTEROPT (RID_OFA_START + 120)
 #define RID_OFAPAGE_MSFILTEROPT2(RID_OFA_START + 121)
 #define RID_SVXPAGE_OPTIONS_CTL (RID_SVX_START + 252)
 #define RID_SVXPAGE_OPTIONS_JAVA(RID_SVX_START + 253)
-#define RID_SVXPAGE_ABOUT_CONFIG(RID_SVX_START + 301)
 #define RID_SVXPAGE_ACCESSIBILITYCONFIG (RID_SVX_START + 250)
 #define RID_SVXPAGE_ASIAN_LAYOUT(RID_SVX_START + 246)
 #define RID_OPTPAGE_CHART_DEFCOLORS (RID_SVX_START + 299)
@@ -140,8 +136,6 @@
 #define RID_SVXSTR_COLOR_CONFIG_DELETE  (RID_SVX_START + 855)
 #define RID_SVXSTR_OPT_DOUBLE_DICTS (RID_SVX_START + 320)
 #define RID_SVXERR_OPT_PROXYPORTS   (RID_SVX_START + 224)
-#define RID_SVXDLG_JAVA_PARAMETER   (RID_SVX_START + 254)
-#define RID_SVXDLG_JAVA_CLASSPATH   (RID_SVX_START + 255)
 #define RID_SVXERR_JRE_NOT_RECOGNIZED   (RID_SVX_START + 256)
 #define RID_SVXERR_JRE_FAILED_VERSION   (RID_SVX_START + 257)
 #define RID_SVXSTR_PATH_NAME_START  (RID_SVX_START + 1003)
@@ -174,7 +168,6 @@
 #define RID_SVXSTR_KEY_USERDICTIONARY_DIR   (RID_SVX_START + 1025)//?
 
 // dialogs
-#define RID_SVX_WND_COMMON_LINGU( RID_SVX_START +  0 )
 #define STR_MODIFY  (RID_SVX_START + 336)//from 
optdict.src
 
 // hyperlink dialog
@@ -213,9 +206,6 @@
 #define RID_SVXSTR_HYPERDLG_FORM_BUTTON (RID_SVX_START +  813)
 #define RID_SVXSTR_HYPERDLG_FROM_TEXT   (RID_SVX_START +  814)
 
-// hangulhanja
-#define RID_SVX_MDLG_HANGULHANJA(RID_SVX_START +  1 )
-
 // icon choice
 #define RID_SVXSTR_ICONCHOICEDLG_RESETBUT   (RID_SVX_START + 580)
 
@@ -249,15 +239,8 @@
 #define RID_SVXSTR_ERROR_TYPE_LABEL (RID_SVX_START + 1108)
 #define RID_SVXSTR_ERROR_MESSAGE_LABEL  (RID_SVX_START + 1109)
 
-// spell check dialog
-#define RID_SVXDLG_SPELLCHECK   (RID_SVX_START +  32)
-
-// split cells
-#define RID_SVX_SPLITCELLDLG( RID_SVX_START + 43 )
-
 // customize
 #define RID_SVXDLG_CUSTOMIZE(RID_SVX_START + 291)
-#define RID_SVXPAGE_TOOLBARS(RID_SVX_START + 294)
 #define RID_SVXPAGE_CONFIGGROUPBOX  (RID_SVX_START + 304)
 
 #define RID_SVXSTR_NEW_MENU (RID_SVX_START + 1039)
diff --git a/include/svx/dialogs.hrc b/include/svx/dialogs.hrc
index d2a7224..0c71500 100644
--- a/include/svx/dialogs.hrc
+++ b/include/svx/dialogs.hrc
@@ -119,7 +119,6 @@
 #define RID_SW_TP_OPTCAPTION_PAGE   (RID_OFA_START + 256)
 #define SID_SC_TP_LAYOUT(RID_OFA_START + 218)
 #define SID_SC_TP_CONTENT   (RID_OFA_START + 219)
-#define SID_SC_TP_INPUT (RID_OFA_START + 220)
 #define SID_SC_TP_GRID  (RID_OFA_START + 221)
 #define SID_SC_TP_USERLISTS (RID_OFA_START + 222)
 #define SID_SC_TP_CALC  (RID_OFA_START + 223)
@@ -1040,13 +1039,8 @@
 // I suggest sticking to per-type ids instead of per-semantic ids, this is
 // better maintainable (IMO), and does not waste that much ids
 
-// "Window" resource ids
-
 // "ModalDialog" resource ids
 
-// "Menu" resource ids
-#define RID_SVX_MDLG_FONTWORK_CHARSPACING   ( RID_SVX_START + 19 )
-
 // document recovery and error report
 // recycling ids from DBManager
 #define RID_SVX_MDLG_DOCRECOVERY_BROKEN ( RID_SVX_START +  12 )
diff --git a/svx/sour

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

[Michael Stahl]

 sw/source/core/doc/docfmt.cxx |   16 
 1 file changed, 16 insertions(+)

New commits:
commit 11525a6f164a5b89caffded73a35797a044f4107
Author: Michael Stahl 
Date:   Tue Aug 5 22:50:23 2014 +0200

fdo#69282: sw: fix updating of page styles via SwDocShell::_LoadStyles()

SwDoc::CopyPageDesc() only copies master and left SwFrmFmt attributes,
but not first-master and first-left.  They will contain exactly the same
attributes as master and left but they still need to be copied...

(see also: that FIXME in pagedesc.hxx)

(regression from 75084f6c42c27dc95418df9cefed2fddfb26000e)

Change-Id: I3dcc3627708b5d6a477eb7fef76cf6c42c95c004
(cherry picked from commit 5c1cc92ee09f9fcc99077cacd3fc55640f03b7b2)
Reviewed-on: https://gerrit.libreoffice.org/10772
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 8f1f976..f5d3ed4 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2136,6 +2136,22 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, 
SwPageDesc& rDstDesc,
 
 rDstDesc.GetLeft().DelDiffs( aAttrSet );
 rDstDesc.GetLeft().SetFmtAttr( aAttrSet );
+
+aAttrSet.ClearItem();
+aAttrSet.Put( rSrcDesc.GetFirstMaster().GetAttrSet() );
+aAttrSet.ClearItem( RES_HEADER );
+aAttrSet.ClearItem( RES_FOOTER );
+
+rDstDesc.GetFirstMaster().DelDiffs( aAttrSet );
+rDstDesc.GetFirstMaster().SetFmtAttr( aAttrSet );
+
+aAttrSet.ClearItem();
+aAttrSet.Put( rSrcDesc.GetFirstLeft().GetAttrSet() );
+aAttrSet.ClearItem( RES_HEADER );
+aAttrSet.ClearItem( RES_FOOTER );
+
+rDstDesc.GetFirstLeft().DelDiffs( aAttrSet );
+rDstDesc.GetFirstLeft().SetFmtAttr( aAttrSet );
 }
 
 CopyHeader( rSrcDesc.GetMaster(), rDstDesc.GetMaster() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source filter/source include/svx sc/source sd/qa svx/source

[Stephan Bergmann]

 cui/source/tabpages/textattr.cxx  |4 +-
 filter/source/msfilter/msdffimp.cxx   |2 -
 filter/source/msfilter/svdfppt.cxx|2 -
 include/svx/sdasitm.hxx   |   22 +++---
 sc/source/filter/excel/xiescher.cxx   |2 -
 sd/qa/unit/export-tests.cxx   |6 +--
 svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx |2 -
 svx/source/svdraw/svdattr.cxx |4 +-
 svx/source/svdraw/svdmodel.cxx|2 -
 svx/source/svdraw/svdoashp.cxx|8 ++---
 10 files changed, 22 insertions(+), 32 deletions(-)

New commits:
commit 43856800f0345a209f4c8f64ac1eb2cb2e114a42
Author: Stephan Bergmann 
Date:   Wed Aug 6 10:20:26 2014 +0200

Consistency around SdrOnOffItem in svx/sdasitm.hxx

...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 "Remove unused ctors" and
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

Change-Id: Icdeff7f37901f99158bb00de5e912c181bf3e688

diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 40958b9..8145328 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -203,7 +203,7 @@ void SvxTextAttrPage::Reset( const SfxItemSet* rAttrs )
 // wordwrap text
 if ( rAttrs->GetItemState( SDRATTR_TEXT_WORDWRAP ) != SFX_ITEM_DONTCARE )
 {
-m_pTsbWordWrapText->SetState( ( ( const SdrTextWordWrapItem& 
)rAttrs->Get( SDRATTR_TEXT_WORDWRAP ) ).
+m_pTsbWordWrapText->SetState( ( ( const SdrOnOffItem& )rAttrs->Get( 
SDRATTR_TEXT_WORDWRAP ) ).
 GetValue() ? TRISTATE_TRUE : TRISTATE_FALSE );
 m_pTsbWordWrapText->EnableTriState( false );
 }
@@ -376,7 +376,7 @@ bool SvxTextAttrPage::FillItemSet( SfxItemSet* rAttrs)
 eState = m_pTsbWordWrapText->GetState();
 if( m_pTsbWordWrapText->IsValueChangedFromSaved() )
 {
-rAttrs->Put( SdrTextWordWrapItem( TRISTATE_TRUE == eState ) );
+rAttrs->Put( makeSdrTextWordWrapItem( TRISTATE_TRUE == eState ) );
 }
 
 eState = m_pTsbContour->GetState();
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index f3105e7..867c8e2 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -1501,7 +1501,7 @@ void DffPropertyReader::ApplyCustomShapeTextAttributes( 
SfxItemSet& rSet ) const
 rSet.Put( makeSdrTextUpperDistItem( nTextTop ) );
 rSet.Put( makeSdrTextLowerDistItem( nTextBottom ) );
 
-rSet.Put( SdrTextWordWrapItem( (MSO_WrapMode)GetPropertyValue( 
DFF_Prop_WrapText, mso_wrapSquare ) != mso_wrapNone ? sal_True : sal_False ) );
+rSet.Put( makeSdrTextWordWrapItem( (MSO_WrapMode)GetPropertyValue( 
DFF_Prop_WrapText, mso_wrapSquare ) != mso_wrapNone ? sal_True : sal_False ) );
 rSet.Put( makeSdrTextAutoGrowHeightItem( ( GetPropertyValue( 
DFF_Prop_FitTextToShape ) & 2 ) != 0 ) );
 }
 
diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 8698fb6..90d3b46 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1078,7 +1078,7 @@ SdrObject* SdrEscherImport::ProcessObj( SvStream& rSt, 
DffObjData& rObjData, voi
 }
 else
 {
-pTObj->SetMergedItem( SdrTextWordWrapItem( bWordWrap ) );
+pTObj->SetMergedItem( makeSdrTextWordWrapItem( bWordWrap ) );
 pTObj->SetMergedItem( makeSdrTextAutoGrowHeightItem( 
bFitShapeToText ) );
 }
 
diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx
index 2144b86..33ebab8 100644
--- a/include/svx/sdasitm.hxx
+++ b/include/svx/sdasitm.hxx
@@ -109,23 +109,13 @@ class SdrCustomShapeReplacementURLItem : public 
SfxStringItem
 SdrCustomShapeReplacementURLItem();
 };
 
+inline SdrOnOffItem makeSdrTextWordWrapItem( bool bAuto ) {
+return SdrOnOffItem( SDRATTR_TEXT_WORDWRAP, bAuto );
+}
 
-// class SdrTextWordWrapItem
-
-class SdrTextWordWrapItem : public SdrOnOffItem {
-public:
-SdrTextWordWrapItem( bool bAuto = false ):  SdrOnOffItem( 
SDRATTR_TEXT_WORDWRAP, bAuto ) {}
-SdrTextWordWrapItem( SvStream& rIn )  : SdrOnOffItem( 
SDRATTR_TEXT_WORDWRAP, rIn )   {}
-};
-
-
-// class SdrTextAutoGrowSizeItem
-
-class SdrTextAutoGrowSizeItem : public SdrOnOffItem {
-public:
-SdrTextAutoGrowSizeItem( bool bAuto = false ):  SdrOnOffItem( 
SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) {}
-SdrTextAutoGrowSizeItem( SvStream& rIn )   :SdrOnOffItem( 
SDRATTR_TEXT_AUTOGROWSIZE, rIn )   {}
-};
+inline SdrOnOffItem makeSdrTextAutoGrowSizeItem( bool bAuto ) {
+return SdrOnOffItem( SDRATTR_TEXT_AUTOGROWSIZE, bAuto ) ;
+}
 
 // some useful inline methods
 
diff --git a/sc/source/

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

[Michael Stahl]

 sw/source/core/doc/docfmt.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 99d06de125334dba6981cec4c5f766fb8debcafb
Author: Michael Stahl 
Date:   Tue Aug 5 22:56:17 2014 +0200

SwDoc::CopyPageDesc(): probably sending Modify for first too cannot hurt

Change-Id: I2056bee7555d3f6723ac374863187d82e4ad9edd
(cherry picked from commit 2e9840d18c09ce5552eec2f9d489d952da1034ae)
Reviewed-on: https://gerrit.libreoffice.org/10773
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index f5d3ed4..18e5137 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -2203,6 +2203,12 @@ void SwDoc::CopyPageDesc( const SwPageDesc& rSrcDesc, 
SwPageDesc& rDstDesc,
 {
 rDstDesc.GetLeft().ModifyBroadcast( &aInfo, 0, TYPE(SwFrm) );
 }
+{
+rDstDesc.GetFirstMaster().ModifyBroadcast( &aInfo, 0, TYPE(SwFrm) 
);
+}
+{
+rDstDesc.GetFirstLeft().ModifyBroadcast( &aInfo, 0, TYPE(SwFrm) );
+}
 }
 }
 
___
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' - include/oox oox/source

[Kohei Yoshida]

 include/oox/helper/graphichelper.hxx   |3 +++
 oox/source/drawingml/chart/chartspaceconverter.cxx |9 -
 oox/source/helper/graphichelper.cxx|5 +
 oox/source/ppt/pptimport.cxx   |6 ++
 4 files changed, 22 insertions(+), 1 deletion(-)

New commits:
commit feed03c590232659e6278ed7eb4137c479543b86
Author: Kohei Yoshida 
Date:   Fri Aug 1 21:39:49 2014 -0400

bnc#886540: Default chart background for pptx docs should be transparent.

Charts in docx and xlsx OTOH use solid white as the default fill style.

(cherry picked from commit 4a8f2431718f99de6fd9ee3461d703d007261c03)

Conflicts:
oox/source/drawingml/chart/chartspaceconverter.cxx
oox/source/ppt/pptimport.cxx

Change-Id: Ic4351fe65cabc12d60214b67c7026a317841f2c7
Reviewed-on: https://gerrit.libreoffice.org/10737
Reviewed-by: Matúš Kukan 
Tested-by: Matúš Kukan 

diff --git a/include/oox/helper/graphichelper.hxx 
b/include/oox/helper/graphichelper.hxx
index b96e993..9e90531 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -75,6 +76,8 @@ public:
 /** Derived classes may implement to resolve a palette index to an RGB 
color. */
 virtual sal_Int32   getPaletteColor( sal_Int32 nPaletteIdx ) const;
 
+virtual css::drawing::FillStyle getDefaultChartAreaFillStyle() const;
+
 // Device info and device dependent unit conversion ---
 
 /** Returns information about the output device. */
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx 
b/oox/source/drawingml/chart/chartspaceconverter.cxx
index db04215..eeba446 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -25,12 +25,14 @@
 #include 
 #include 
 #include 
+#include 
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/drawingml/chart/chartconverter.hxx"
 #include "oox/drawingml/chart/chartdrawingfragment.hxx"
 #include "oox/drawingml/chart/chartspacemodel.hxx"
 #include "oox/drawingml/chart/plotareaconverter.hxx"
 #include "oox/drawingml/chart/titleconverter.hxx"
+#include 
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
@@ -90,8 +92,13 @@ void ChartSpaceConverter::convertFromModel( const Reference< 
XShapes >& rxExtern
 {
 }
 
-// formatting of the chart background
+// formatting of the chart background.  The default fill style varies with 
applications.
 PropertySet aBackPropSet( getChartDocument()->getPageBackground() );
+
+aBackPropSet.setProperty(
+PROP_FillStyle,
+
uno::makeAny(getFilter().getGraphicHelper().getDefaultChartAreaFillStyle()));
+
 getFormatter().convertFrameFormatting( aBackPropSet, mrModel.mxShapeProp, 
OBJECTTYPE_CHARTSPACE );
 
 // convert plot area (container of all chart type groups)
diff --git a/oox/source/helper/graphichelper.cxx 
b/oox/source/helper/graphichelper.cxx
index 5cb2b69..e40f019 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -158,6 +158,11 @@ sal_Int32 GraphicHelper::getPaletteColor( sal_Int32 
/*nPaletteIdx*/ ) const
 return API_RGB_TRANSPARENT;
 }
 
+drawing::FillStyle GraphicHelper::getDefaultChartAreaFillStyle() const
+{
+return drawing::FillStyle_SOLID;
+}
+
 // Device info and device dependent unit conversion ---
 
 const awt::DeviceInfo& GraphicHelper::getDeviceInfo() const
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index fc9dadf..d294b79 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -185,6 +185,7 @@ class PptGraphicHelper : public GraphicHelper
 public:
 explicitPptGraphicHelper( const PowerPointImport& rFilter );
 virtual sal_Int32   getSchemeColor( sal_Int32 nToken ) const;
+virtual drawing::FillStyle getDefaultChartAreaFillStyle() const;
 private:
 const PowerPointImport& mrFilter;
 };
@@ -200,6 +201,11 @@ sal_Int32 PptGraphicHelper::getSchemeColor( sal_Int32 
nToken ) const
 return mrFilter.getSchemeColor( nToken );
 }
 
+drawing::FillStyle PptGraphicHelper::getDefaultChartAreaFillStyle() const
+{
+return drawing::FillStyle_NONE;
+}
+
 } // namespace
 
 GraphicHelper* PowerPointImport::implCreateGraphicHelper() const
___
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' - include/oox oox/source

[Kohei Yoshida]

 include/oox/helper/graphichelper.hxx   |3 +++
 oox/source/drawingml/chart/chartspaceconverter.cxx |8 +++-
 oox/source/helper/graphichelper.cxx|5 +
 oox/source/ppt/pptimport.cxx   |6 ++
 4 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit e9f77854e20433287ca32569af01eb1508ca51a5
Author: Kohei Yoshida 
Date:   Fri Aug 1 21:39:49 2014 -0400

bnc#886540: Default chart background for pptx docs should be transparent.

Charts in docx and xlsx OTOH use solid white as the default fill style.

(cherry picked from commit 4a8f2431718f99de6fd9ee3461d703d007261c03)
(cherry picked from commit 013744a5b475e151ca0918565fb369e22dfbc1db)

Conflicts:
oox/source/drawingml/chart/chartspaceconverter.cxx

Change-Id: Ic4351fe65cabc12d60214b67c7026a317841f2c7
Reviewed-on: https://gerrit.libreoffice.org/10736
Reviewed-by: Matúš Kukan 
Tested-by: Matúš Kukan 

diff --git a/include/oox/helper/graphichelper.hxx 
b/include/oox/helper/graphichelper.hxx
index f74963c..5981445 100644
--- a/include/oox/helper/graphichelper.hxx
+++ b/include/oox/helper/graphichelper.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -75,6 +76,8 @@ public:
 /** Derived classes may implement to resolve a palette index to an RGB 
color. */
 virtual sal_Int32   getPaletteColor( sal_Int32 nPaletteIdx ) const;
 
+virtual css::drawing::FillStyle getDefaultChartAreaFillStyle() const;
+
 // Device info and device dependent unit conversion ---
 
 /** Returns information about the output device. */
diff --git a/oox/source/drawingml/chart/chartspaceconverter.cxx 
b/oox/source/drawingml/chart/chartspaceconverter.cxx
index 2238fe2..b63bfe9 100644
--- a/oox/source/drawingml/chart/chartspaceconverter.cxx
+++ b/oox/source/drawingml/chart/chartspaceconverter.cxx
@@ -25,12 +25,14 @@
 #include 
 #include 
 #include 
+#include 
 #include "oox/core/xmlfilterbase.hxx"
 #include "oox/drawingml/chart/chartconverter.hxx"
 #include "oox/drawingml/chart/chartdrawingfragment.hxx"
 #include "oox/drawingml/chart/chartspacemodel.hxx"
 #include "oox/drawingml/chart/plotareaconverter.hxx"
 #include "oox/drawingml/chart/titleconverter.hxx"
+#include 
 
 using namespace ::com::sun::star;
 using ::com::sun::star::uno::Reference;
@@ -90,8 +92,12 @@ void ChartSpaceConverter::convertFromModel( const Reference< 
XShapes >& rxExtern
 {
 }
 
-// formatting of the chart background
+// formatting of the chart background.  The default fill style varies with 
applications.
 PropertySet aBackPropSet( getChartDocument()->getPageBackground() );
+aBackPropSet.setProperty(
+PROP_FillStyle,
+
uno::makeAny(getFilter().getGraphicHelper().getDefaultChartAreaFillStyle()));
+
 if( mrModel.mxShapeProp.is() )
 {
 getFormatter().convertFrameFormatting( aBackPropSet, 
mrModel.mxShapeProp, OBJECTTYPE_CHARTSPACE );
diff --git a/oox/source/helper/graphichelper.cxx 
b/oox/source/helper/graphichelper.cxx
index 135a91c..5281da2 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -158,6 +158,11 @@ sal_Int32 GraphicHelper::getPaletteColor( sal_Int32 
/*nPaletteIdx*/ ) const
 return API_RGB_TRANSPARENT;
 }
 
+drawing::FillStyle GraphicHelper::getDefaultChartAreaFillStyle() const
+{
+return drawing::FillStyle_SOLID;
+}
+
 // Device info and device dependent unit conversion ---
 
 const awt::DeviceInfo& GraphicHelper::getDeviceInfo() const
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index c3aa2208..df15d77 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -190,6 +190,7 @@ class PptGraphicHelper : public GraphicHelper
 public:
 explicitPptGraphicHelper( const PowerPointImport& rFilter );
 virtual sal_Int32   getSchemeColor( sal_Int32 nToken ) const SAL_OVERRIDE;
+virtual drawing::FillStyle getDefaultChartAreaFillStyle() const 
SAL_OVERRIDE;
 private:
 const PowerPointImport& mrFilter;
 };
@@ -205,6 +206,11 @@ sal_Int32 PptGraphicHelper::getSchemeColor( sal_Int32 
nToken ) const
 return mrFilter.getSchemeColor( nToken );
 }
 
+drawing::FillStyle PptGraphicHelper::getDefaultChartAreaFillStyle() const
+{
+return drawing::FillStyle_NONE;
+}
+
 } // namespace
 
 GraphicHelper* PowerPointImport::implCreateGraphicHelper() const
___
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' - chart2/source

[Kohei Yoshida]

 chart2/source/view/main/ChartView.cxx |   32 +---
 1 file changed, 1 insertion(+), 31 deletions(-)

New commits:
commit 73ff5af13bd25b2d0e3a56dd196da217c844a07d
Author: Kohei Yoshida 
Date:   Tue Aug 5 14:57:18 2014 -0400

bnc#886540: Let's not push the available area down when no titles are there.

This improves visual layout compability with MS Office chart & looks better.

Change-Id: I348ea81152eca4e3bba9e0d9460448d9314738ad
(cherry picked from commit b398ed8e3f95b75705bb2e53d49589ef7fdbb1c7)
Reviewed-on: https://gerrit.libreoffice.org/10770
Reviewed-by: Matúš Kukan 
Tested-by: Matúš Kukan 

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index f5f0fb1..5ea6c95 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2250,37 +2250,7 @@ boost::shared_ptr lcl_createTitle( 
TitleHelper::eTitleType eType
 break;
 }
 }
-else
-{
-// #i109336# Improve auto positioning in chart
-switch ( eAlignment )
-{
-case ALIGN_TOP:
-{
-rRemainingSpace.Y += nYDistance;
-rRemainingSpace.Height -= nYDistance;
-}
-break;
-case ALIGN_BOTTOM:
-{
-rRemainingSpace.Height -= nYDistance;
-}
-break;
-case ALIGN_LEFT:
-{
-rRemainingSpace.X += nXDistance;
-rRemainingSpace.Width -= nXDistance;
-}
-break;
-case ALIGN_RIGHT:
-{
-rRemainingSpace.Width -= nXDistance;
-}
-break;
-default:
-break;
-}
-}
+
 return apVTitle;
 }
 
___
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' - chart2/source

[Kohei Yoshida]

 chart2/source/view/main/ChartView.cxx |   32 +---
 1 file changed, 1 insertion(+), 31 deletions(-)

New commits:
commit a3438ee890b360dda9201f03a78e1c5b98193c36
Author: Kohei Yoshida 
Date:   Tue Aug 5 14:57:18 2014 -0400

bnc#886540: Let's not push the available area down when no titles are there.

This improves visual layout compability with MS Office chart & looks better.

Change-Id: I348ea81152eca4e3bba9e0d9460448d9314738ad
(cherry picked from commit b398ed8e3f95b75705bb2e53d49589ef7fdbb1c7)
Reviewed-on: https://gerrit.libreoffice.org/10771
Reviewed-by: Matúš Kukan 
Tested-by: Matúš Kukan 

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index c6b5878..1965f05 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2217,37 +2217,7 @@ boost::shared_ptr lcl_createTitle( 
TitleHelper::eTitleType eType
 break;
 }
 }
-else
-{
-// #i109336# Improve auto positioning in chart
-switch ( eAlignment )
-{
-case ALIGN_TOP:
-{
-rRemainingSpace.Y += nYDistance;
-rRemainingSpace.Height -= nYDistance;
-}
-break;
-case ALIGN_BOTTOM:
-{
-rRemainingSpace.Height -= nYDistance;
-}
-break;
-case ALIGN_LEFT:
-{
-rRemainingSpace.X += nXDistance;
-rRemainingSpace.Width -= nXDistance;
-}
-break;
-case ALIGN_RIGHT:
-{
-rRemainingSpace.Width -= nXDistance;
-}
-break;
-default:
-break;
-}
-}
+
 return apVTitle;
 }
 
___
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' - sd/source

[Jan Holesovsky]

 sd/source/ui/slidesorter/view/SlsLayouter.cxx |   12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit a4a5fe4c66fe35c432127c28be7d52dc52fb4f58
Author: Jan Holesovsky 
Date:   Fri Aug 1 21:10:22 2014 +0200

bnc#862514: Handle corner case in slide sorter correctly.

We should never return -1 when bIncludeBordersAndGaps is true; but that 
could
have happened in a corner case:

* export SAL_USE_VCLPLUGIN=gen
* start LibreOffice
* open a presentation with many slides
* resize the window so that it shows the slides _exactly_, no slide is cut
  off in the slide sorter
* point the mouse pointer into the left "Slides" sidebar (slide sorter) so
  that it does not cause any mouse-over effect (somehow between the left
  border, and the slides - there is space that can do this)
* turn the mouse wheel all the way down so that the last slide is at the
  bottom
* turn the mouse wheel up _once_
* turn the mouse wheel down _once_ - it will look like the view does not
  change (the last but one is still at the bottom), but you can see the
  scrollbar jump to the top
* and now you can again start turning the wheel all the way down to repeat
  the procedure :-)

Reviewed-on: https://gerrit.libreoffice.org/10683
Reviewed-by: David Tardon 
Tested-by: David Tardon 
(cherry picked from commit 48272a9a720039e79c6a684f1f037811ea42ed0c)

Change-Id: I0253c89513222a1f2eb3263068997d10eea0f130
Signed-off-by: Matúš Kukan 

diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx 
b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index c4b6ae2..5c9ec8e 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -627,11 +627,15 @@ sal_Int32 Layouter::Implementation::GetRowAtPosition (
 // When inside the gap below then nYPosition is not over a page
 // object.
 if (nDistanceIntoGap > 0)
-nRow = ResolvePositionInGap (
+{
+sal_Int32 nResolvedRow = ResolvePositionInGap(
 nDistanceIntoGap,
 eGapMembership,
 nRow,
 mnVerticalGap);
+if (!bIncludeBordersAndGaps || nResolvedRow != -1)
+nRow = nResolvedRow;
+}
 }
 else if (bIncludeBordersAndGaps)
 {
@@ -670,11 +674,15 @@ sal_Int32 Layouter::Implementation::GetColumnAtPosition (
 // When inside the gap at the right then nXPosition is not over a
 // page object.
 if (nDistanceIntoGap > 0)
-nColumn = ResolvePositionInGap (
+{
+sal_Int32 nResolvedColumn = ResolvePositionInGap(
 nDistanceIntoGap,
 eGapMembership,
 nColumn,
 mnHorizontalGap);
+if (!bIncludeBordersAndGaps || nResolvedColumn != -1)
+nColumn = nResolvedColumn;
+}
 }
 else if (bIncludeBordersAndGaps)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 writerfilter/inc/ooxml/OOXMLDocument.hxx|6 +-
 writerfilter/source/ooxml/OOXMLDocumentImpl.cxx |6 ++
 writerfilter/source/ooxml/OOXMLFactory.cxx  |2 +-
 writerfilter/source/ooxml/OOXMLFactory.hxx  |2 +-
 writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx |7 +++
 writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx |4 +---
 writerfilter/source/ooxml/OOXMLStreamImpl.cxx   |6 ++
 writerfilter/source/ooxml/OOXMLStreamImpl.hxx   |3 +--
 8 files changed, 16 insertions(+), 20 deletions(-)

New commits:
commit 4a93e2d99cd6b9ce554bc97ed2539d124b894c7b
Author: Miklos Vajna 
Date:   Wed Aug 6 10:38:32 2014 +0200

writerfilter: fix dbglevel=2 build

Change-Id: Ifd471e49cb167af48a9173762812164890e00791

diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx 
b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 9dda533..ab932c6 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -273,6 +273,10 @@ public:
 
 void ooxmlidsToXML(::std::iostream & out);
 
+#ifdef DEBUG_DOMAINMAPPER
+std::string fastTokenToId(sal_uInt32 nToken);
+#endif
+
 }}
 #endif // INCLUDED_WRITERFILTER_INC_OOXML_OOXMLDOCUMENT_HXX
 
diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx 
b/writerfilter/source/ooxml/OOXMLFactory.cxx
index 651cd6f..de24d2c 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -81,7 +81,7 @@ TokenToIdMapPointer OOXMLFactory_ns::getTokenToIdMap(Id nId)
 }
 
 #ifdef DEBUG_DOMAINMAPPER
-string OOXMLFactory_ns::getDefineName(Id /*nId*/) const
+std::string OOXMLFactory_ns::getDefineName(Id /*nId*/) const
 {
 return "";
 }
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx 
b/writerfilter/source/ooxml/OOXMLFactory.hxx
index 567a392..bfa93c7 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -98,7 +98,7 @@ public:
 virtual void endAction(OOXMLFastContextHandler * pHandler);
 virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t 
nToken, OOXMLValue::Pointer_t pValue);
 #ifdef DEBUG_DOMAINMAPPER
-virtual string getDefineName(Id nId) const;
+virtual std::string getDefineName(Id nId) const;
 #endif
 
 AttributeToResourceMapPointer getAttributeToResourceMap(Id nId);
commit c5613c51efcd4c97d5b2f33e11d635fb1484acd7
Author: Miklos Vajna 
Date:   Wed Aug 6 09:42:01 2014 +0200

OOXMLFastTokenHandler doesn't need an UNO context

Change-Id: I476d7e26d35e38d458f62c01f478ed2b54eed355

diff --git a/writerfilter/inc/ooxml/OOXMLDocument.hxx 
b/writerfilter/inc/ooxml/OOXMLDocument.hxx
index 18c21da..9dda533 100644
--- a/writerfilter/inc/ooxml/OOXMLDocument.hxx
+++ b/writerfilter/inc/ooxml/OOXMLDocument.hxx
@@ -111,7 +111,7 @@ public:
 virtual const OUString & getTarget() const = 0;
 
 virtual css::uno::Reference
-getFastTokenHandler(css::uno::Reference 
rContext) = 0;
+getFastTokenHandler() = 0;
 
 };
 
diff --git a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx 
b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
index aca59c1..1bef14e 100644
--- a/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLDocumentImpl.cxx
@@ -94,8 +94,7 @@ void OOXMLDocumentImpl::resolveFastSubStream(Stream & 
rStreamHandler,
 
 uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler
 (pDocHandler);
-uno::Reference < xml::sax::XFastTokenHandler > xTokenHandler
-(mpStream->getFastTokenHandler(xContext));
+uno::Reference < xml::sax::XFastTokenHandler > 
xTokenHandler(mpStream->getFastTokenHandler());
 
 xParser->setFastDocumentHandler(xDocumentHandler);
 xParser->setTokenHandler(xTokenHandler);
@@ -471,8 +470,7 @@ void OOXMLDocumentImpl::resolve(Stream & rStream)
 pDocHandler->setIsSubstream( mbIsSubstream );
 uno::Reference < xml::sax::XFastDocumentHandler > xDocumentHandler
 (pDocHandler);
-uno::Reference < xml::sax::XFastTokenHandler > xTokenHandler
-(mpStream->getFastTokenHandler(xContext));
+uno::Reference < xml::sax::XFastTokenHandler > 
xTokenHandler(mpStream->getFastTokenHandler());
 
 resolveFastSubStream(rStream, OOXMLStream::SETTINGS);
 mxThemeDom = importSubStream(OOXMLStream::THEME);
diff --git a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
index b90b1e3..1295716 100644
--- a/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx
@@ -41,10 +41,9 @@ namespace ooxml
 
 using namespace ::std;
 
-OOXMLFastTokenHandler::OOXMLFastTokenHandler
-(css::uno::Reference< css::uno::XComponentContext > const & context)
-: m_xContext(context)
-{}
+OOXMLFastTokenHandler::OOXMLFastTokenHandler()
+{
+}
 
 // ::com::sun::star::xml::sax::XFastTokenHandler:
 

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

[Jan Holesovsky]

 include/sfx2/recentdocsview.hxx|3 +++
 sfx2/source/control/recentdocsview.cxx |   25 +
 2 files changed, 16 insertions(+), 12 deletions(-)

New commits:
commit 2a005fcc9a7eb92f0029a47c9796975250fc4d14
Author: Jan Holesovsky 
Date:   Fri Aug 1 15:13:34 2014 +0200

hidpi, startcenter: Don't set fixed font heigt in the startcenter.

Change-Id: I68efbd08d21b514ab1659cd6bddfc2c4788c4a74
Reviewed-on: https://gerrit.libreoffice.org/10682
Reviewed-by: Zolnai Tamás 
Tested-by: Zolnai Tamás 

diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 453eb3f..ac5cc92 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -73,6 +73,9 @@ protected:
 
 bool isAcceptedFile(const OUString &rURL) const;
 
+/// Set (larger) font for the Welcome message.
+void SetMessageFont();
+
 longmnItemMaxSize;
 longmnTextHeight;
 longmnItemPadding;
diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index f0c9c05..0fcb12d 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -117,6 +117,13 @@ bool RecentDocsView::isAcceptedFile(const OUString &rURL) 
const
(mnFileTypes & TYPE_OTHER&& typeMatchesExtension(TYPE_OTHER,   
aExt));
 }
 
+void RecentDocsView::SetMessageFont()
+{
+Font aFont(GetFont());
+aFont.SetHeight(aFont.GetHeight()*1.3);
+SetFont(aFont);
+}
+
 BitmapEx RecentDocsView::getDefaultThumbnail(const OUString &rURL)
 {
 BitmapEx aImg;
@@ -195,13 +202,11 @@ void RecentDocsView::Reload()
 Invalidate();
 
 // Set preferred width
-if( mFilteredItemList.empty() )
+if (mFilteredItemList.empty())
 {
 Font aOldFont(GetFont());
-Font aNewFont(aOldFont);
-aNewFont.SetHeight(20);
-SetFont(aNewFont);
-
set_width_request(std::max(GetTextWidth(maWelcomeLine1),GetTextWidth(maWelcomeLine2)));
+SetMessageFont();
+set_width_request(std::max(GetTextWidth(maWelcomeLine1), 
GetTextWidth(maWelcomeLine2)));
 SetFont(aOldFont);
 }
 else
@@ -257,9 +262,7 @@ void RecentDocsView::Paint( const Rectangle &aRect )
 {
 // No recent files to be shown yet. Show a welcome screen.
 Font aOldFont(GetFont());
-Font aNewFont(aOldFont);
-aNewFont.SetHeight(20);
-SetFont(aNewFont);
+SetMessageFont();
 
 long nTextHeight = GetTextHeight();
 
@@ -301,10 +304,8 @@ long RecentDocsView::GetThumbnailSize() const
 void RecentDocsView::Clear()
 {
 Font aOldFont(GetFont());
-Font aNewFont(aOldFont);
-aNewFont.SetHeight(20);
-SetFont(aNewFont);
-
set_width_request(std::max(GetTextWidth(maWelcomeLine1),GetTextWidth(maWelcomeLine2)));
+SetMessageFont();
+set_width_request(std::max(GetTextWidth(maWelcomeLine1), 
GetTextWidth(maWelcomeLine2)));
 SetFont(aOldFont);
 
 ThumbnailView::Clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 include/svx/sxelditm.hxx  |1 +
 svx/source/svdraw/svdattr.cxx |5 +
 2 files changed, 6 insertions(+)

New commits:
commit 596ec6f52fe3a8d56d5c20df568633cfbcadc74d
Author: Stephan Bergmann 
Date:   Wed Aug 6 11:09:47 2014 +0200

Missing SdrEdgeLine1DeltaItem::Clone override

Change-Id: Id0fde0a76fbcb63c13c943a0caec0d715886f039

diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx
index 27f7122..5709350 100644
--- a/include/svx/sxelditm.hxx
+++ b/include/svx/sxelditm.hxx
@@ -33,6 +33,7 @@ class SVX_DLLPUBLIC SdrEdgeLine1DeltaItem: public 
SdrMetricItem {
 public:
 SdrEdgeLine1DeltaItem(long nVal=0): 
SdrMetricItem(SDRATTR_EDGELINE1DELTA,nVal)  {}
 SdrEdgeLine1DeltaItem(SvStream& rIn): 
SdrMetricItem(SDRATTR_EDGELINE1DELTA,rIn) {}
+virtual SfxPoolItem * Clone(SfxItemPool *) const SAL_OVERRIDE;
 virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) const SAL_OVERRIDE;
 virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) SAL_OVERRIDE;
 };
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index acb47d9..aee5b80 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -1747,6 +1747,11 @@ bool SdrEdgeNode2VertDistItem::PutValue( const uno::Any& 
rVal, sal_uInt8 /*nMemb
 return true;
 }
 
+SfxPoolItem * SdrEdgeLine1DeltaItem::Clone(SfxItemPool *) const
+{
+return new SdrEdgeLine1DeltaItem(*this);
+}
+
 bool SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 
/*nMemberId*/) const
 {
 rVal <<= (sal_Int32)GetValue();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Maxim Monastirsky]

 filter/source/xsltfilter/XSLTFilter.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit b7325b907edf0cd8e2ca577e9796c1cf7d56bd70
Author: Maxim Monastirsky 
Date:   Wed Aug 6 12:30:22 2014 +0300

fdo#45418 xslt: Make sure we're reading from the beginning

Change-Id: Id5beb6af8c32ab45d7e31120d38966f8fe4d5418

diff --git a/filter/source/xsltfilter/XSLTFilter.cxx 
b/filter/source/xsltfilter/XSLTFilter.cxx
index 26cb3a0..4c769e8 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -58,6 +58,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -338,6 +339,10 @@ namespace XSLT
 {
 try
 {
+css::uno::Reference 
xSeek(xInputStream, UNO_QUERY);
+if (xSeek.is())
+xSeek->seek(0);
+
 // we want to be notfied when the processing is done...
 
m_tcontrol->addListener(css::uno::Reference (
 this));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] mso-dumper.git: msodumper/docrecord.py

[Miklos Vajna]

 msodumper/docrecord.py |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 771b435fb0941d21c58cafd78d2c90f905ed29f6
Author: Miklos Vajna 
Date:   Wed Aug 6 11:36:21 2014 +0200

docrecord: avoid UnicodeEncodeError on non-utf8 terminals

As reported by Tor Lillqvist.

diff --git a/msodumper/docrecord.py b/msodumper/docrecord.py
index 6904c5e..bb13b94 100644
--- a/msodumper/docrecord.py
+++ b/msodumper/docrecord.py
@@ -6,6 +6,7 @@
 #
 
 import struct
+import locale
 import globals
 from docdirstream import DOCDirStream
 import docsprm
@@ -3070,7 +3071,8 @@ class Xst(DOCDirStream):
 def dump(self):
 print '' % self.pos
 self.printAndSet("cch", self.readuInt16())
-print '' % 
globals.encodeName(self.bytes[self.pos:self.pos + 2 * 
self.cch].decode('utf-16'), lowOnly=True)
+lowOnly = locale.getdefaultlocale()[1] == "UTF-8"
+print '' % 
globals.encodeName(self.bytes[self.pos:self.pos + 2 * 
self.cch].decode('utf-16'), lowOnly=lowOnly)
 self.pos += 2 * self.cch
 print ''
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jan Holesovsky]

 writerfilter/source/ooxml/OOXMLFactory.cxx  |   18 --
 writerfilter/source/ooxml/OOXMLFactory.hxx  |   11 
 writerfilter/source/ooxml/factory_ns.py |7 --
 writerfilter/source/ooxml/factoryimpl.py|3 -
 writerfilter/source/ooxml/factoryimpl_ns.py |   76 ++--
 5 files changed, 34 insertions(+), 81 deletions(-)

New commits:
commit 8ec7e5250c204422b5efdf277de0722adb042728
Author: Jan Holesovsky 
Date:   Wed Aug 6 11:36:30 2014 +0200

writerfilter: getDefineName() is unused, kill it.

Change-Id: I7d733a509f8256d0c2bfbb4bbd91ed6924452051

diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx 
b/writerfilter/source/ooxml/OOXMLFactory.cxx
index d066d25..75bee97 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -72,13 +72,6 @@ CreateElementMapPointer 
OOXMLFactory_ns::getCreateElementMap(Id nId)
 return m_CreateElementsMap[nId];
 }
 
-#ifdef DEBUG_DOMAINMAPPER
-std::string OOXMLFactory_ns::getDefineName(Id /*nId*/) const
-{
-return "";
-}
-#endif
-
 // class OOXMLFactory
 
 typedef rtl::Static< osl::Mutex, OOXMLFactory > OOXMLFactory_Mutex;
diff --git a/writerfilter/source/ooxml/OOXMLFactory.hxx 
b/writerfilter/source/ooxml/OOXMLFactory.hxx
index c72c52b..f171b70 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.hxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.hxx
@@ -93,9 +93,6 @@ public:
 virtual void charactersAction(OOXMLFastContextHandler * pHandler, const 
OUString & rString);
 virtual void endAction(OOXMLFastContextHandler * pHandler);
 virtual void attributeAction(OOXMLFastContextHandler * pHandler, Token_t 
nToken, OOXMLValue::Pointer_t pValue);
-#ifdef DEBUG_DOMAINMAPPER
-virtual std::string getDefineName(Id nId) const;
-#endif
 
 AttributeToResourceMapPointer getAttributeToResourceMap(Id nId);
 CreateElementMapPointer getCreateElementMap(Id nId);
diff --git a/writerfilter/source/ooxml/factory_ns.py 
b/writerfilter/source/ooxml/factory_ns.py
index e13c6af..2ab8889 100644
--- a/writerfilter/source/ooxml/factory_ns.py
+++ b/writerfilter/source/ooxml/factory_ns.py
@@ -39,9 +39,6 @@ public:
 virtual CreateElementMapPointer createCreateElementMap(Id nId);
 virtual bool getListValue(Id nId, const OUString& rValue, sal_uInt32& 
rOutValue);
 virtual Id getResourceId(Id nDefine, sal_Int32 nToken);
-#ifdef DEBUG_DOMAINMAPPER
-virtual string getDefineName(Id nId) const;
-#endif
 """ % nsToken)
 
 actions = []
diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py 
b/writerfilter/source/ooxml/factoryimpl_ns.py
index 7b6eeac..73282d8 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.py
+++ b/writerfilter/source/ooxml/factoryimpl_ns.py
@@ -507,31 +507,6 @@ def factoryActions(nsNode):
 print()
 
 
-# factoryGetDefineName
-
-
-def factoryGetDefineName(nsNode):
-print("""#ifdef DEBUG_DOMAINMAPPER
-string OOXMLFactory_%s::getDefineName(Id nId) const
-{
-static IdToStringMapPointer pMap;
-
-if (pMap.get() == NULL)
-{
-pMap = IdToStringMapPointer(new IdToStringMap());
-
-""" % nsToLabel(nsNode))
-for defineNode in getChildrenByName(getChildByName(nsNode, "grammar"), 
"define"):
-print("""(*pMap)[%s] = "%s";""" % (idForDefine(nsNode, 
defineNode), defineNode.getAttribute("name")))
-print("""}
-
-return (*pMap)[nId];
-}
-#endif
-
-""")
-
-
 # factoryGetResourceId
 
 
@@ -704,7 +679,6 @@ namespace ooxml {
 factoryGetListValue(nsNode)
 factoryCreateElementMap(files, nsNode)
 factoryActions(nsNode)
-factoryGetDefineName(nsNode)
 factoryGetResourceId(nsNode)
 factoryAttributeAction(nsNode)
 
commit 9ff65cb532fb066c7f3ffc4176290eefc3ac8cdf
Author: Jan Holesovsky 
Date:   Wed Aug 6 11:25:51 2014 +0200

writerfilter: Kill TokenToIdsMap's, and use switches instead.

This seems to save another nearly 300k; and I guess the compiler will 
optimize
it better than using the unordered_map.

Change-Id: I5df5cd2afe3f4bedad69e1e3477211842c40a90c

diff --git a/writerfilter/source/ooxml/OOXMLFactory.cxx 
b/writerfilter/source/ooxml/OOXMLFactory.cxx
index de24d2c..d066d25 100644
--- a/writerfilter/source/ooxml/OOXMLFactory.cxx
+++ b/writerfilter/source/ooxml/OOXMLFactory.cxx
@@ -72,14 +72,6 @@ CreateElementMapPointer 
OOXMLFactory_ns::getCreateElementMap(Id nId)
 return m_CreateElementsMap[nId];
 }
 
-TokenToIdMapPointer OOXMLFactory_ns::getTokenToIdMap(Id nId)
-{
-if (m_TokenToIdsMap.find(nId) == m_TokenToIdsMap.end())
-m_TokenToIdsMap[nId] = createTokenToIdMap(nId);
-
-return m_TokenToIdsMap[nId];
-}
-
 #ifdef DEBUG_DOMAINMAPPER
 std::string OOXMLFactory_ns::getDefineName(Id /*nId*/) const
 {
@@ -120,7 +112,6 @@ void OOXMLFactory::attributes(OOXMLFastContextHandler * 
pHandler,
 
 if (pFactory.get() != NULL)
 {
-TokenToIdMapPointer pTokenToIdMap = pFactory->getTokenToIdMap(nDefine);
 AttributeT

[Libreoffice-commits] core.git: external/libgltf external/liborcus

[Jan-Marek Glogowski]

 external/libgltf/ExternalProject_libgltf.mk|   10 
 external/libgltf/UnpackedTarball_libgltf.mk|2 
 external/libgltf/patches/autoreconf_run.patch  | 3867 +
 external/libgltf/patches/fix_configure_flags.patch |   54 
 external/liborcus/ExternalProject_liborcus.mk  |2 
 5 files changed, 3930 insertions(+), 5 deletions(-)

New commits:
commit 1f23cc159de5e8584b9354a42d431356530d1ce0
Author: Jan-Marek Glogowski 
Date:   Wed Aug 6 11:53:25 2014 +0200

Fix libgltf dbgutil build

The libgltf configure.ac script changes the autotools user variables
CFLAGS and CXXFLAGS, which is not allowed and can overwrite user
settings (which it does for the -D_GLIBCXX_DEBUG flag).

So this moves the special compile settings to seperate variables and
passes them to AM_CXXFLAGS and AM_CPPFLAGS, so the library actually
gets compiled with libstdc++ debug objects.

Change-Id: I00989f5fb629a6aac43ee5a2eb287b0491a3b86d

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index d880c99..cd84dcd 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -52,16 +52,17 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
/p:AdditionalLibraryDirectories=$(if 
$(SYSTEM_GLEW),,"$(subst /,\,$(call gb_UnpackedTarball_get_dir,glew))\lib\$(if 
$(MSVC_USE_DEBUG_RUNTIME),Debug,Release)\Win32") \
,build/win32)
 
-else
+else # !ifeq($(COM),MSC)
 
-libgltf_CPPFLAGS :=
+libgltf_CPPFLAGS=$(CPPFLAGS)
+ifneq (,$(filter ANDROID DRAGONFLY FREEBSD IOS LINUX NETBSD OPENBSD,$(OS)))
 ifneq (,$(gb_ENABLE_DBGUTIL))
-   libgltf_CPPFLAGS += -D_GLIBCXX_DEBUG
+libgltf_CPPFLAGS+=-D_GLIBCXX_DEBUG
+endif
 endif
 
 $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
-   CPPFLAGS='$(libgltf_CPPFLAGS)' \
export PKG_CONFIG="" \
&& ./configure \
--disable-shared \
@@ -72,6 +73,7 @@ $(call gb_ExternalProject_get_state_target,libgltf,build) :
BOOST_CFLAGS="$(if 
$(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) 
-I$(BUILDDIR)/config_$(gb_Side)" \
GLEW_CFLAGS="$(if 
$(SYSTEM_GLEW),$(GLEW_CFLAGS),-I$(call 
gb_UnpackedTarball_get_dir,glew)/include)" \
GLM_CFLAGS="$(if $(SYSTEM_GLM),$(GLM_CFLAGS),-I$(call 
gb_UnpackedTarball_get_dir,glm))" \
+   $(if 
$(libgltf_CPPFLAGS),CPPFLAGS='$(libgltf_CPPFLAGS)') \
&& $(MAKE) \
)
 
diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index 861eb2e..be83620 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -17,6 +17,8 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/missing_include.patch \
+   external/libgltf/patches/fix_configure_flags.patch \
+   external/libgltf/patches/autoreconf_run.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/autoreconf_run.patch 
b/external/libgltf/patches/autoreconf_run.patch
new file mode 100644
index 000..4ba0b6d
--- /dev/null
+++ b/external/libgltf/patches/autoreconf_run.patch
@@ -0,0 +1,3867 @@
+diff -ur libgltf-0.0.0.orig/aclocal.m4 libgltf-0.0.0/aclocal.m4
+--- libgltf-0.0.0.orig/aclocal.m4  2014-08-04 15:58:04.0 +0200
 libgltf-0.0.0/aclocal.m4   2014-08-06 11:27:51.435630853 +0200
+@@ -1,7 +1,8 @@
+-# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
+-
+-# Copyright (C) 1996-2013 Free Software Foundation, Inc.
++# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
+ 
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
++# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
++# Inc.
+ # This file is free software; the Free Software Foundation
+ # gives unlimited permission to copy and/or distribute it,
+ # with or without modifications, as long as this notice is preserved.
+@@ -11,14 +12,13 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+ 
+-m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], 
[])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
+ m4_ifndef([AC_AUTOCONF_VERSION],
+   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
+-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+-[m4_warning([this file was generated for autoconf 2.69.
++m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
++[m4_warning([this file was generated for autoconf 2.68.
+ You have another version of autoconf.  It may work, but is not guaranteed to.
+ If you have problems, you may need to regenerate the build system entirely.

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

[Stephan Bergmann]

 include/svx/sxelditm.hxx  |6 -
 svx/source/svdraw/svdattr.cxx |   48 --
 2 files changed, 54 deletions(-)

New commits:
commit 3efa3ad7b6de78c291f49858e50e6bedbd6a2173
Author: Stephan Bergmann 
Date:   Wed Aug 6 12:15:38 2014 +0200

SdrEdgreLine*DeltaItem::Put/QueryValue are same as underlying

...CntInt32Item::Put/QueryValue

Change-Id: I21602be0f4ba9d9e34a379a86d524b05976b0c8f

diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx
index 5709350..b3491d1 100644
--- a/include/svx/sxelditm.hxx
+++ b/include/svx/sxelditm.hxx
@@ -34,24 +34,18 @@ public:
 SdrEdgeLine1DeltaItem(long nVal=0): 
SdrMetricItem(SDRATTR_EDGELINE1DELTA,nVal)  {}
 SdrEdgeLine1DeltaItem(SvStream& rIn): 
SdrMetricItem(SDRATTR_EDGELINE1DELTA,rIn) {}
 virtual SfxPoolItem * Clone(SfxItemPool *) const SAL_OVERRIDE;
-virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) const SAL_OVERRIDE;
-virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) SAL_OVERRIDE;
 };
 
 class SVX_DLLPUBLIC SdrEdgeLine2DeltaItem: public SdrMetricItem {
 public:
 SdrEdgeLine2DeltaItem(long nVal=0): 
SdrMetricItem(SDRATTR_EDGELINE2DELTA,nVal)  {}
 SdrEdgeLine2DeltaItem(SvStream& rIn): 
SdrMetricItem(SDRATTR_EDGELINE2DELTA,rIn) {}
-virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) const SAL_OVERRIDE;
-virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) SAL_OVERRIDE;
 };
 
 class SVX_DLLPUBLIC SdrEdgeLine3DeltaItem: public SdrMetricItem {
 public:
 SdrEdgeLine3DeltaItem(long nVal=0): 
SdrMetricItem(SDRATTR_EDGELINE3DELTA,nVal)  {}
 SdrEdgeLine3DeltaItem(SvStream& rIn): 
SdrMetricItem(SDRATTR_EDGELINE3DELTA,rIn) {}
-virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) const SAL_OVERRIDE;
-virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) SAL_OVERRIDE;
 };
 
 #endif
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index aee5b80..37e89ee 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -1752,54 +1752,6 @@ SfxPoolItem * SdrEdgeLine1DeltaItem::Clone(SfxItemPool 
*) const
 return new SdrEdgeLine1DeltaItem(*this);
 }
 
-bool SdrEdgeLine1DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 
/*nMemberId*/) const
-{
-rVal <<= (sal_Int32)GetValue();
-return true;
-}
-
-bool SdrEdgeLine1DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 
/*nMemberId*/)
-{
-sal_Int32 nValue = 0;
-if(!(rVal >>= nValue))
-return false;
-
-SetValue( nValue );
-return true;
-}
-
-bool SdrEdgeLine2DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 
/*nMemberId*/) const
-{
-rVal <<= (sal_Int32)GetValue();
-return true;
-}
-
-bool SdrEdgeLine2DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 
/*nMemberId*/)
-{
-sal_Int32 nValue = 0;
-if(!(rVal >>= nValue))
-return false;
-
-SetValue( nValue );
-return true;
-}
-
-bool SdrEdgeLine3DeltaItem::QueryValue( uno::Any& rVal, sal_uInt8 
/*nMemberId*/) const
-{
-rVal <<= (sal_Int32)GetValue();
-return true;
-}
-
-bool SdrEdgeLine3DeltaItem::PutValue( const uno::Any& rVal, sal_uInt8 
/*nMemberId*/)
-{
-sal_Int32 nValue = 0;
-if(!(rVal >>= nValue))
-return false;
-
-SetValue( nValue );
-return true;
-}
-
 //
 // Measure
 //
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 cui/source/tabpages/connect.cxx |   18 +-
 include/svx/sxelditm.hxx|   25 +
 sd/source/ui/view/drviewsj.cxx  |6 +++---
 svx/source/svdraw/svdattr.cxx   |   11 +++
 svx/source/svdraw/svdoedge.cxx  |   18 +-
 5 files changed, 33 insertions(+), 45 deletions(-)

New commits:
commit 14ac70c74a9abd62936db74d825ab9d3375f2504
Author: Stephan Bergmann 
Date:   Wed Aug 6 12:54:53 2014 +0200

Consistency around SdrMetricItem in svx/sxelditm.hxx

...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 "Remove unused ctors" and
68969cc61adecac481ae9656978ef952f435b310 "Consistency around SdrMetricItem."

(SdrEdgeLine1DeltaItem::Clone had been recently---and in retrospect 
needlessly
---introduced in 596ec6f52fe3a8d56d5c20df568633cfbcadc74d "Missing
SdrEdgeLine1DeltaItem::Clone override" before
3efa3ad7b6de78c291f49858e50e6bedbd6a2173 
"SdrEdgreLine*DeltaItem::Put/QueryValue
are same as underlying" revealed that SdrEdgeLine1DeltaItem was a needless
derivation of SdrMetricItem.)

Change-Id: I154d32d46a7c01c792aa4e812cf576d4d749e0c9

diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 97cc1c2..59a0dbd 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -224,7 +224,7 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs )
 pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE1DELTA );
 if( pItem )
 {
-long nValue = ( ( const SdrEdgeLine1DeltaItem* )pItem )->GetValue();
+long nValue = ( ( const SdrMetricItem* )pItem )->GetValue();
 SetMetricValue( *m_pMtrFldLine1, nValue, eUnit );
 }
 else
@@ -238,7 +238,7 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs )
 pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE2DELTA );
 if( pItem )
 {
-long nValue = ( ( const SdrEdgeLine2DeltaItem* )pItem )->GetValue();
+long nValue = ( ( const SdrMetricItem* )pItem )->GetValue();
 SetMetricValue( *m_pMtrFldLine2, nValue, eUnit );
 }
 else
@@ -252,7 +252,7 @@ void SvxConnectionPage::Reset( const SfxItemSet* rAttrs )
 pItem = &pPool->GetDefaultItem( SDRATTR_EDGELINE3DELTA );
 if( pItem )
 {
-long nValue = ( ( const SdrEdgeLine3DeltaItem* )pItem )->GetValue();
+long nValue = ( ( const SdrMetricItem* )pItem )->GetValue();
 SetMetricValue( *m_pMtrFldLine3, nValue, eUnit );
 }
 else
@@ -343,21 +343,21 @@ bool SvxConnectionPage::FillItemSet( SfxItemSet* rAttrs)
 if( m_pMtrFldLine1->IsValueChangedFromSaved() )
 {
 nValue = GetCoreValue( *m_pMtrFldLine1, eUnit );
-rAttrs->Put( SdrEdgeLine1DeltaItem( nValue ) );
+rAttrs->Put( makeSdrEdgeLine1DeltaItem( nValue ) );
 bModified = true;
 }
 
 if( m_pMtrFldLine2->IsValueChangedFromSaved() )
 {
 nValue = GetCoreValue( *m_pMtrFldLine2, eUnit );
-rAttrs->Put( SdrEdgeLine2DeltaItem( nValue ) );
+rAttrs->Put( makeSdrEdgeLine2DeltaItem( nValue ) );
 bModified = true;
 }
 
 if( m_pMtrFldLine3->IsValueChangedFromSaved() )
 {
 nValue = GetCoreValue( *m_pMtrFldLine3, eUnit );
-rAttrs->Put( SdrEdgeLine3DeltaItem( nValue ) );
+rAttrs->Put( makeSdrEdgeLine3DeltaItem( nValue ) );
 bModified = true;
 }
 
@@ -429,19 +429,19 @@ IMPL_LINK( SvxConnectionPage, ChangeAttrHdl_Impl, void *, 
p )
 if( p == m_pMtrFldLine1 )
 {
 sal_Int32 nValue = GetCoreValue( *m_pMtrFldLine1, eUnit );
-aAttrSet.Put( SdrEdgeLine1DeltaItem( nValue ) );
+aAttrSet.Put( makeSdrEdgeLine1DeltaItem( nValue ) );
 }
 
 if( p == m_pMtrFldLine2 )
 {
 sal_Int32 nValue = GetCoreValue( *m_pMtrFldLine2, eUnit );
-aAttrSet.Put( SdrEdgeLine2DeltaItem( nValue ) );
+aAttrSet.Put( makeSdrEdgeLine2DeltaItem( nValue ) );
 }
 
 if( p == m_pMtrFldLine3 )
 {
 sal_Int32 nValue = GetCoreValue( *m_pMtrFldLine3, eUnit );
-aAttrSet.Put( SdrEdgeLine3DeltaItem( nValue ) );
+aAttrSet.Put( makeSdrEdgeLine3DeltaItem( nValue ) );
 }
 
 
diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx
index b3491d1..7fdf25d 100644
--- a/include/svx/sxelditm.hxx
+++ b/include/svx/sxelditm.hxx
@@ -29,24 +29,17 @@ public:
 SdrEdgeLineDeltaAnzItem(SvStream& rIn): 
SfxUInt16Item(SDRATTR_EDGELINEDELTAANZ,rIn)  {}
 };
 
-class SVX_DLLPUBLIC SdrEdgeLine1DeltaItem: public SdrMetricItem {
-public:
-SdrEdgeLine1DeltaItem(long nVal=0): 
SdrMetricItem(SDRATTR_EDGELINE1DELTA,nVal)  {}
-SdrEdgeLine1DeltaItem(SvStream& rIn): 
SdrMetricItem(SDRATTR_EDGELINE1DELTA,rIn) {}
-virtual SfxPoolItem * Clone(SfxItemPool *) const SAL_OVERRIDE;
-};
+inline SdrMetricItem makeSdrEdgeLine1DeltaItem(long nVal) {
+return SdrMetricItem(SDRATTR_EDGELINE1DELTA, nVal);
+}
 
-clas

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

[Jan Holesovsky]

 writerfilter/source/ooxml/factoryimpl_ns.py |   52 +++-
 1 file changed, 28 insertions(+), 24 deletions(-)

New commits:
commit 8a29e551ff9335fdaa16400044a475afd72ae559
Author: Jan Holesovsky 
Date:   Wed Aug 6 13:12:08 2014 +0200

writerfilter: Make startAction / endAction / charactersAction readable.

Change-Id: Ibcf63b3d15223ca9f217406231f97c20f3663819

diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py 
b/writerfilter/source/ooxml/factoryimpl_ns.py
index 73282d8..93db0eb 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.py
+++ b/writerfilter/source/ooxml/factoryimpl_ns.py
@@ -382,9 +382,11 @@ def charactersActionForValues(nsNode, refNode):
 
 def factoryChooseAction(actionNode):
 ret = []
+extra_space = ""
 if actionNode.hasAttribute("tokenid"):
 ret.append("if (sal::static_int_cast(pHandler->getId()) == 
%s)" % idToLabel(actionNode.getAttribute("tokenid")))
 ret.append("{")
+extra_space = ""
 for condNode in getChildrenByName(actionNode, "cond"):
 ret.append("{")
 ret.append("OOXMLPropertySetEntryToInteger aHandler(%s);" % 
idToLabel(condNode.getAttribute("tokenid")))
@@ -392,43 +394,44 @@ def factoryChooseAction(actionNode):
 ret.append("")
 ret.append("if (sal::static_int_cast(aHandler.getValue()) 
== %s)" % idToLabel(condNode.getAttribute("value")))
 ret.append("{")
+extra_space = ""
 
 if actionNode.getAttribute("action") in ("handleXNotes", "handleHdrFtr", 
"handleComment", "handlePicture", "handleBreak", "handleOLE", "handleFontRel"):
-ret.append("
dynamic_cast(pHandler)->%s();" % 
actionNode.getAttribute("action"))
+ret.append("
%sdynamic_cast(pHandler)->%s();" % 
(extra_space, actionNode.getAttribute("action")))
 elif actionNode.getAttribute("action") == 
"propagateCharacterPropertiesAsSet":
-ret.append("pHandler->propagateCharacterPropertiesAsSet(%s);" % 
idToLabel(actionNode.getAttribute("sendtokenid")))
+ret.append("%spHandler->propagateCharacterPropertiesAsSet(%s);" % 
(extra_space, idToLabel(actionNode.getAttribute("sendtokenid"
 elif actionNode.getAttribute("action") in ("startCell", "endCell"):
-ret.append("
dynamic_cast(pHandler)->%s();" % 
actionNode.getAttribute("action"))
+ret.append("
%sdynamic_cast(pHandler)->%s();" % 
(extra_space, actionNode.getAttribute("action")))
 elif actionNode.getAttribute("action") in ("startRow", "endRow"):
-ret.append("
dynamic_cast(pHandler)->%s();" % 
actionNode.getAttribute("action"))
+ret.append("
%sdynamic_cast(pHandler)->%s();" % 
(extra_space, actionNode.getAttribute("action")))
 elif actionNode.getAttribute("action") == "handleGridBefore":
-ret.append("
dynamic_cast(pHandler)->%s();" % 
actionNode.getAttribute("action"))
+ret.append("
%sdynamic_cast(pHandler)->%s();" % 
(extra_space, actionNode.getAttribute("action")))
 elif actionNode.getAttribute("action") in ("sendProperty", 
"handleHyperlink"):
-ret.append("
dynamic_cast(pHandler)->%s();" % 
actionNode.getAttribute("action"))
+ret.append("
%sdynamic_cast(pHandler)->%s();" % 
(extra_space, actionNode.getAttribute("action")))
 elif actionNode.getAttribute("action") == "fieldstart":
-ret.append("pHandler->startField();")
+ret.append("%spHandler->startField();" % (extra_space))
 elif actionNode.getAttribute("action") == "fieldsep":
-ret.append("pHandler->fieldSeparator();")
+ret.append("%spHandler->fieldSeparator();" % (extra_space))
 elif actionNode.getAttribute("action") == "fieldend":
-ret.append("pHandler->endField();")
+ret.append("%spHandler->endField();" % (extra_space))
 elif actionNode.getAttribute("action") == "printproperty":
-ret.append("
dynamic_cast(pHandler)->sendProperty(%s);" % 
idToLabel(actionNode.getAttribute("sendtokenid")))
+ret.append("
%sdynamic_cast(pHandler)->sendProperty(%s);" % 
(extra_space, idToLabel(actionNode.getAttribute("sendtokenid"
 elif actionNode.getAttribute("action") == "sendPropertiesWithId":
-ret.append("pHandler->sendPropertiesWithId(%s);" % 
idToLabel(actionNode.getAttribute("sendtokenid")))
+ret.append("%spHandler->sendPropertiesWithId(%s);" % (extra_space, 
idToLabel(actionNode.getAttribute("sendtokenid"
 elif actionNode.getAttribute("action") == "text":
-ret.append("pHandler->text(sText);")
+ret.append("%spHandler->text(sText);" % (extra_space))
 elif actionNode.getAttribute("action") == "positionOffset":
-ret.append("pHandler->positionOffset(sText);")
+ret.append("%spHandler->positionOffset(sText);" % (extra_space))
 elif actionNode.getAttribute("action") == "positivePercentage":
-ret.app

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

[Jan-Marek Glogowski]

 external/libgltf/UnpackedTarball_libgltf.mk|2 
 external/libgltf/patches/autoreconf_run.patch  | 3867 -
 external/libgltf/patches/fix_configure_flags.patch |   54 
 3 files changed, 3923 deletions(-)

New commits:
commit c7b975c41274233e28fcaf65412031584ee7a497
Author: Jan-Marek Glogowski 
Date:   Wed Aug 6 13:52:07 2014 +0200

Drop unneeded libgltf autotools changes

For whatever reason the tinderboxes still try to regenerate the
autotools based files, even after applying the generated file
change after the template changes.

These patches aren't needed, as the original problem is the CPPFLAGS
environment visibility, so we drop them.

Change-Id: Idb5caf662c997221337416686313101ad2193e40

diff --git a/external/libgltf/UnpackedTarball_libgltf.mk 
b/external/libgltf/UnpackedTarball_libgltf.mk
index be83620..861eb2e 100644
--- a/external/libgltf/UnpackedTarball_libgltf.mk
+++ b/external/libgltf/UnpackedTarball_libgltf.mk
@@ -17,8 +17,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libgltf,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libgltf,\
external/libgltf/patches/missing_include.patch \
-   external/libgltf/patches/fix_configure_flags.patch \
-   external/libgltf/patches/autoreconf_run.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libgltf/patches/autoreconf_run.patch 
b/external/libgltf/patches/autoreconf_run.patch
deleted file mode 100644
index 4ba0b6d..000
--- a/external/libgltf/patches/autoreconf_run.patch
+++ /dev/null
@@ -1,3867 +0,0 @@
-diff -ur libgltf-0.0.0.orig/aclocal.m4 libgltf-0.0.0/aclocal.m4
 libgltf-0.0.0.orig/aclocal.m4  2014-08-04 15:58:04.0 +0200
-+++ libgltf-0.0.0/aclocal.m4   2014-08-06 11:27:51.435630853 +0200
-@@ -1,7 +1,8 @@
--# generated automatically by aclocal 1.13.4 -*- Autoconf -*-
--
--# Copyright (C) 1996-2013 Free Software Foundation, Inc.
-+# generated automatically by aclocal 1.11.3 -*- Autoconf -*-
- 
-+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
-+# Inc.
- # This file is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -11,14 +12,13 @@
- # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- # PARTICULAR PURPOSE.
- 
--m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], 
[])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])])
- m4_ifndef([AC_AUTOCONF_VERSION],
-   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
--m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
--[m4_warning([this file was generated for autoconf 2.69.
-+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
-+[m4_warning([this file was generated for autoconf 2.68.
- You have another version of autoconf.  It may work, but is not guaranteed to.
- If you have problems, you may need to regenerate the build system entirely.
--To do so, use the procedure documented by the package, typically 
'autoreconf'.])])
-+To do so, use the procedure documented by the package, typically 
`autoreconf'.])])
- 
- # pkg.m4 - Macros to locate and utilise pkg-config.-*- Autoconf 
-*-
- # serial 1 (pkg-config-0.24)
-@@ -180,77 +180,25 @@
- fi[]dnl
- ])# PKG_CHECK_MODULES
- 
--
--# PKG_INSTALLDIR(DIRECTORY)
--# -
--# Substitutes the variable pkgconfigdir as the location where a module
--# should install pkg-config .pc files. By default the directory is
--# $libdir/pkgconfig, but the default can be changed by passing
--# DIRECTORY. The user can override through the --with-pkgconfigdir
--# parameter.
--AC_DEFUN([PKG_INSTALLDIR],
--[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
--m4_pushdef([pkg_description],
--[pkg-config installation directory @<:@]pkg_default[@:>@])
--AC_ARG_WITH([pkgconfigdir],
--[AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
--[with_pkgconfigdir=]pkg_default)
--AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
--m4_popdef([pkg_default])
--m4_popdef([pkg_description])
--]) dnl PKG_INSTALLDIR
--
--
--# PKG_NOARCH_INSTALLDIR(DIRECTORY)
--# -
--# Substitutes the variable noarch_pkgconfigdir as the location where a
--# module should install arch-independent pkg-config .pc files. By
--# default the directory is $datadir/pkgconfig, but the default can be
--# changed by passing DIRECTORY. The user can override through the
--# --with-noarch-pkgconfigdir parameter.
--AC_DEFUN([PKG_NOARCH_INSTALLDIR],
--[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
--m4_pushdef([pkg_description],
--[pkg-config arch-independent installation directory 
@<:@]pkg_default[@:>@])
--AC_ARG_WITH([noarch-pkgconfigdir],
--[AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
--[with_noarch_p

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

[Palenik Mihály]

 dbaccess/UIConfig_dbaccess.mk  |1 
 dbaccess/source/ui/dlg/dbadmin.hrc |3 
 dbaccess/source/ui/dlg/dbadmin.src |   45 
 dbaccess/source/ui/dlg/detailpages.cxx |   41 ++-
 dbaccess/source/ui/dlg/detailpages.hxx |   10 -
 dbaccess/uiconfig/ui/dbasepage.ui  |  172 +
 6 files changed, 188 insertions(+), 84 deletions(-)

New commits:
commit 1ff594ce98e9620578975decad1c6df382de82a4
Author: Palenik Mihály 
Date:   Wed Aug 6 00:00:02 2014 +0200

Convert PAGE_DBASE to .ui

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

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 0ac73bf..1fdbaa9 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/connectionpage \
 dbaccess/uiconfig/ui/copytablepage \
 dbaccess/uiconfig/ui/dbaseindexdialog \
+dbaccess/uiconfig/ui/dbasepage \
 dbaccess/uiconfig/ui/dbwizconnectionpage \
 dbaccess/uiconfig/ui/dbwizmysqlintropage \
 dbaccess/uiconfig/ui/dbwizmysqlnativepage \
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc 
b/dbaccess/source/ui/dlg/dbadmin.hrc
index 75d39b6..d097204 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -24,7 +24,6 @@
 
 #define FT_OPTIONS  5
 #define FT_JDBCDRIVERCLASS  7
-#define FT_SPECIAL_MESSAGE  8
 #define FT_HOSTNAME 10
 #define FT_BASEDN   11
 #define FT_PORTNUMBER   12
@@ -35,10 +34,8 @@
 #define ET_HOSTNAME 5
 #define ET_BASEDN   6
 
-#define PB_INDICIES 1
 #define PB_TESTDRIVERCLASS  5
 
-#define CB_SHOWDELETEDROWS  2
 #define CB_USESSL   3
 #define CB_USECATALOG   4
 
diff --git a/dbaccess/source/ui/dlg/dbadmin.src 
b/dbaccess/source/ui/dlg/dbadmin.src
index 4e89db9..b3301a3 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -77,51 +77,6 @@ String STR_DATABASE_TYPE_CHANGE
 Text [ en-US ] = "Database properties" ;
 };
 
-TabPage PAGE_DBASE
-{
-SVLook = TRUE ;
-Hide = TRUE;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
-HelpId = HID_DSADMIN_PAGE_DBASE;
-
-AUTO_CHARSET(UNRELATED_CONTROLS,PAGE_X)
-
-FixedLine FL_SEPARATOR1
-{
-Pos = MAP_APPFONT ( 4 , 2*UNRELATED_CONTROLS + RELATED_CONTROLS + 
2*FIXEDTEXT_HEIGHT) ;
-Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = "Optional settings";
-};
-
-CheckBox CB_SHOWDELETEDROWS
-{
-Pos = MAP_APPFONT ( 6 , 2*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 
3*FIXEDTEXT_HEIGHT) ;
-Size = MAP_APPFONT ( 200 , CHECKBOX_HEIGHT ) ;
-TabStop = TRUE ;
-HelpId = HID_DSADMIN_SHOWDELETED;
-Text [ en-US ] = "Display deleted records as well" ;
-};
-
-FixedText FT_SPECIAL_MESSAGE
-{
-Hide = TRUE;
-WordBreak = TRUE;
-Pos = MAP_APPFONT ( 6 , 3*UNRELATED_CONTROLS + 2*RELATED_CONTROLS + 
3*FIXEDTEXT_HEIGHT + CHECKBOX_HEIGHT) ;
-Size = MAP_APPFONT ( PAGE_X - 12 , 2*FIXEDTEXT_HEIGHT ) ;
-Text [ en-US ] = "Note: When deleted, and thus inactive, records are 
displayed, you will not be able to delete records from the data source." ;
-};
-
-PushButton PB_INDICIES
-{
-Pos = MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS, 
PAGE_Y - BUTTON_HEIGHT - UNRELATED_CONTROLS) ;
-Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
-TabStop = TRUE ;
-HelpId = HID_DSADMIN_DBASE_INDICIES;
-Text [ en-US ] = "Indexes...";
-};
-};
-
 TabPage PAGE_ADO
 {
 SVLook = TRUE ;
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx 
b/dbaccess/source/ui/dlg/detailpages.cxx
index 6d63fce..7b5c78a 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -247,20 +247,15 @@ namespace dbaui
 
 // ODbaseDetailsPage
 ODbaseDetailsPage::ODbaseDetailsPage( Window* pParent, const SfxItemSet& 
_rCoreAttrs )
-:OCommonBehaviourTabPage(pParent, PAGE_DBASE, _rCoreAttrs, 
CBTP_USE_CHARSET ,false)
-,m_aShowDeleted (this, ModuleRes(CB_SHOWDELETEDROWS))
-,m_aFL_1(this, ModuleRes( FL_SEPARATOR1) )
-,m_aFT_Message  (this, ModuleRes( FT_SPECIAL_MESSAGE) )
-,m_aIndexes (this, ModuleRes(PB_INDICIES))
+:OCommonBehaviourTabPage(pParent, "DbasePage", 
"dbaccess/ui/dbasepage.ui", _rCoreAttrs, CBTP_USE_CHARSET)
 {
+get(m_pShowDeleted, "showDelRowsCheckbutton");
+get(m_pFT_Message, "specMessageLabel");
+get(m_pIndexes, "indiciesButton");
+set_height_request(300);
 
-m_aIndexes.SetClickHdl(L

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - basegfx/source

[Armin Le Grand]

 basegfx/source/polygon/b2dpolygonclipper.cxx |  136 ++-
 1 file changed, 71 insertions(+), 65 deletions(-)

New commits:
commit a02eb39b84d130e5923f72edb2abb3b21adf6fff
Author: Armin Le Grand 
Date:   Wed Aug 6 10:42:28 2014 +

i125349 refined to exclude possible recursive calls

diff --git a/basegfx/source/polygon/b2dpolygonclipper.cxx 
b/basegfx/source/polygon/b2dpolygonclipper.cxx
index b8e9fdb..10c1cc2 100644
--- a/basegfx/source/polygon/b2dpolygonclipper.cxx
+++ b/basegfx/source/polygon/b2dpolygonclipper.cxx
@@ -417,71 +417,6 @@ namespace basegfx
 
 if(rCandidate.count() && rClip.count())
 {
-// #125349# detect if both given PolyPolygons are indeed ranges
-bool bBothRectangle(false);
-
-if(basegfx::tools::isRectangle(rCandidate))
-{
-if(basegfx::tools::isRectangle(rClip))
-{
-// both are ranges
-bBothRectangle = true;
-}
-else
-{
-// rCandidate is rectangle -> clip rClip on 
rRectangle, use the much
-// cheaper and numerically more stable clipping 
against a range
-// This simplification (exchanging content and clip) 
is valid
-// since we do a logical AND operation
-return clipPolyPolygonOnRange(rClip, 
rCandidate.getB2DRange(), bInside, bStroke);
-}
-}
-else if(basegfx::tools::isRectangle(rClip))
-{
-if(basegfx::tools::isRectangle(rCandidate))
-{
-// both are ranges
-bBothRectangle = true;
-}
-else
-{
-// rClip is rectangle -> clip rCandidate on 
rRectangle, use the much
-// cheaper and numerically more stable clipping 
against a range
-return clipPolyPolygonOnRange(rCandidate, 
rClip.getB2DRange(), bInside, bStroke);
-}
-}
-
-if(bBothRectangle)
-{
-// both are rectangle
-if(rCandidate.getB2DRange().equal(rClip.getB2DRange()))
-{
-// if both are equal -> no change
-return rCandidate;
-}
-else
-{
-// not equal -> create new intersection from both 
ranges,
-// but much cheaper based on the ranges
-basegfx::B2DRange 
aIntersectionRange(rCandidate.getB2DRange());
-
-aIntersectionRange.intersect(rClip.getB2DRange());
-
-if(aIntersectionRange.isEmpty())
-{
-// no common IntersectionRange -> the clip will be 
empty
-return B2DPolyPolygon();
-}
-else
-{
-// use common aIntersectionRange as result, convert
-// to expected PolyPolygon form
-return basegfx::B2DPolyPolygon(
-
basegfx::tools::createPolygonFromRect(aIntersectionRange));
-}
-}
-}
-
 // one or both are no rectangle - go the hard way and clip 
PolyPolygon
 // against PolyPolygon...
 if(bStroke)
@@ -552,6 +487,77 @@ namespace basegfx
 }
 else
 {
+// check for simplification with ranges if !bStroke 
(handling as stroke is more simple),
+// but also only when bInside, else the simplification may 
lead to recursive calls (see
+// calls to clipPolyPolygonOnPolyPolygon in 
clipPolyPolygonOnRange and clipPolygonOnRange)
+if(bInside)
+{
+// #125349# detect if both given PolyPolygons are 
indeed ranges
+bool bBothRectangle(false);
+
+if(basegfx::tools::isRectangle(rCandidate))
+{
+if(basegfx::tools::isRectangle(rClip))
+{
+// both are ranges
+bBothRectangle = true;
+}
+else
+{
+// rCandidate is rectangle -> clip rClip on 
rRectangle, use the much
+// cheaper and numerically 

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - external/libgltf

[Jan-Marek Glogowski]

 external/libgltf/ExternalProject_libgltf.mk |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8980637bfb843016473fad5cb9dce0a6ca1297b1
Author: Jan-Marek Glogowski 
Date:   Wed Aug 6 13:16:55 2014 +0200

Fix libgltf dbgutil build

The simpler version of the master fix
  commit 1f23cc159de5e8584b9354a42d431356530d1ce0

This just changes the environment visibility of CPPFLAGS by
exporting it, so $(MAKE) and configure actually see it.

Change-Id: I6d508cbfbee26cdb3062f0628ee8151be4f11881
Reviewed-on: https://gerrit.libreoffice.org/10788
Reviewed-by: Zolnai Tamás 
Tested-by: Zolnai Tamás 

diff --git a/external/libgltf/ExternalProject_libgltf.mk 
b/external/libgltf/ExternalProject_libgltf.mk
index 8c8878d..548487b 100644
--- a/external/libgltf/ExternalProject_libgltf.mk
+++ b/external/libgltf/ExternalProject_libgltf.mk
@@ -60,8 +60,8 @@ endif
 
 $(call gb_ExternalProject_get_state_target,libgltf,build) :
$(call gb_ExternalProject_run,build,\
-   CPPFLAGS='$(libgltf_CPPFLAGS)' \
-   export PKG_CONFIG="" \
+   export CPPFLAGS='$(libgltf_CPPFLAGS)' \
+   && export PKG_CONFIG="" \
&& ./configure \
--with-pic \
--disable-debug \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk sc/source

[Palenik Mihály]

 dbaccess/UIConfig_dbaccess.mk |1 
 dbaccess/source/ui/dlg/dbadmin.hrc|4 
 dbaccess/source/ui/dlg/dbadmin.src|   82 -
 dbaccess/source/ui/dlg/detailpages.cxx|  119 ++--
 dbaccess/source/ui/dlg/detailpages.hxx|   21 -
 dbaccess/uiconfig/ui/generalspecialjdbcdetailspage.ui |  260 ++
 sc/source/ui/docshell/impex.cxx   |5 
 7 files changed, 314 insertions(+), 178 deletions(-)

New commits:
commit 7b10285665605a659dd901634b3d4010a0f0b2c4
Author: Palenik Mihály 
Date:   Wed Aug 6 12:22:12 2014 +0200

Convert PAGE_MYSQL_JDBC and PAGE_ORACLE_JDBC to .ui

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

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 1fdbaa9..3373b84 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -33,6 +33,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/finalpagewizard \
 dbaccess/uiconfig/ui/generalpagedialog \
 dbaccess/uiconfig/ui/generalpagewizard \
+dbaccess/uiconfig/ui/generalspecialjdbcdetailspage \
 dbaccess/uiconfig/ui/generatedvaluespage \
 dbaccess/uiconfig/ui/indexdesigndialog \
 dbaccess/uiconfig/ui/jdbcconnectionpage \
diff --git a/dbaccess/source/ui/dlg/dbadmin.hrc 
b/dbaccess/source/ui/dlg/dbadmin.hrc
index d097204..4e1dcc8 100644
--- a/dbaccess/source/ui/dlg/dbadmin.hrc
+++ b/dbaccess/source/ui/dlg/dbadmin.hrc
@@ -23,19 +23,15 @@
 // control ids
 
 #define FT_OPTIONS  5
-#define FT_JDBCDRIVERCLASS  7
 #define FT_HOSTNAME 10
 #define FT_BASEDN   11
 #define FT_PORTNUMBER   12
 #define FT_LDAPROWCOUNT 13
 
 #define ET_OPTIONS  3
-#define ET_JDBCDRIVERCLASS  4
 #define ET_HOSTNAME 5
 #define ET_BASEDN   6
 
-#define PB_TESTDRIVERCLASS  5
-
 #define CB_USESSL   3
 #define CB_USECATALOG   4
 
diff --git a/dbaccess/source/ui/dlg/dbadmin.src 
b/dbaccess/source/ui/dlg/dbadmin.src
index b3301a3..7d38b0a 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -132,88 +132,6 @@ TabPage PAGE_MYSQL_ODBC
 AUTO_CHARSET( UNRELATED_CONTROLS, PAGE_X )
 };
 
-TabPage PAGE_MYSQL_JDBC
-{
-HelpID = "dbaccess:TabPage:PAGE_MYSQL_JDBC";
-SVLook = TRUE ;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
-Hide = TRUE;
-
-AUTO_FIXEDLINE_CONNSETTINGS( UNRELATED_CONTROLS )
-AUTO_HOST_AND_PORT( UNRELATED_CONTROLS + RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT )
-AUTO_SOCKETCONTROLGROUP(3*UNRELATED_CONTROLS + RELATED_CONTROLS + 
3*FIXEDTEXT_HEIGHT)
-
-FixedText FT_JDBCDRIVERCLASS
-{
-Pos = MAP_APPFONT ( 6,
-4*UNRELATED_CONTROLS + RELATED_CONTROLS + 
3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT) ;
-Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = "MySQL JDBC d~river class";
-};
-Edit ET_JDBCDRIVERCLASS
-{
-HelpID = "dbaccess:Edit:PAGE_MYSQL_JDBC:ET_JDBCDRIVERCLASS";
-Pos = MAP_APPFONT ( EDIT_X,
-4*UNRELATED_CONTROLS + RELATED_CONTROLS + 
3*FIXEDTEXT_HEIGHT -1 + EDIT_HEIGHT) ;
-Size = MAP_APPFONT ( 97 , EDIT_HEIGHT ) ;
-TabStop = TRUE ;
-Border = TRUE ;
-};
-PushButton PB_TESTDRIVERCLASS
-{
-HelpID = "dbaccess:PushButton:PAGE_MYSQL_JDBC:PB_TESTDRIVERCLASS";
-TabStop = TRUE ;
-Pos = MAP_APPFONT ( PAGE_X  - BUTTON_WIDTH - UNRELATED_CONTROLS , 
4*UNRELATED_CONTROLS + RELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT -2 + EDIT_HEIGHT) ;
-Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ;
-Text [ en-US ] = "Test class" ;
-};
-
-AUTO_CHARSET( 5*UNRELATED_CONTROLS + RELATED_CONTROLS + 
4*FIXEDTEXT_HEIGHT+ EDIT_HEIGHT, PAGE_X )
-};
-
-TabPage PAGE_ORACLE_JDBC
-{
-HelpID = "dbaccess:TabPage:PAGE_ORACLE_JDBC";
-SVLook = TRUE ;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
-Hide = TRUE;
-
-AUTO_FIXEDLINE_CONNSETTINGS( UNRELATED_CONTROLS )
-AUTO_HOST_AND_PORT( UNRELATED_CONTROLS + RELATED_CONTROLS + 
FIXEDTEXT_HEIGHT )
-
-AUTO_SOCKETCONTROLGROUP(3*UNRELATED_CONTROLS + RELATED_CONTROLS + 
3*FIXEDTEXT_HEIGHT)
-
-FixedText FT_JDBCDRIVERCLASS
-{
-Pos = MAP_APPFONT ( 6,
-4*UNRELATED_CONTROLS + RELATED_CONTROLS + 
3*FIXEDTEXT_HEIGHT + EDIT_HEIGHT) ;
-Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = "Oracle JDBC d~river class";
-};
-Edit ET_JDBCDRIVERCLASS
-{
-HelpID = "dbaccess:Edit:PAGE_ORACLE_JDBC:ET_JDBCDRIVERCLASS";
-Pos = MAP_APPFONT ( EDIT_X,
-  

[Libreoffice-commits] core.git: vcl/Library_vclplug_gen.mk vcl/unx

[Riccardo Magliocchetti]

 vcl/Library_vclplug_gen.mk  |7 ---
 vcl/unx/generic/app/saldisp.cxx |   33 +
 2 files changed, 1 insertion(+), 39 deletions(-)

New commits:
commit 4a2280e4a2bbc936625dc9816e5491da6ba770ac
Author: Riccardo Magliocchetti 
Date:   Mon Aug 4 15:52:16 2014 +0200

Kill XSUN Xinerama support

XSun is a relic from Solaris 10 / SPARC.

Change-Id: I5c379a496ee5953d71fe51b86cf9992c92943126
Reviewed-on: https://gerrit.libreoffice.org/10756
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/vcl/Library_vclplug_gen.mk b/vcl/Library_vclplug_gen.mk
index 2390020..c3f00aa 100644
--- a/vcl/Library_vclplug_gen.mk
+++ b/vcl/Library_vclplug_gen.mk
@@ -116,8 +116,6 @@ endif
 
 ## handle Xinerama
 ifneq ($(USE_XINERAMA),)
-ifneq ($(OS)$(USE_XINERAMA_VERSION),SOLARISXsun)
-# not Solaris/Xsun
 $(eval $(call gb_Library_add_defs,vclplug_gen,\
 -DUSE_XINERAMA_XORG \
 ))
@@ -130,11 +128,6 @@ $(eval $(call gb_Library_add_libs,vclplug_gen,\
 -Wl$(COMMA)-Bstatic -lXinerama -Wl$(COMMA)-Bdynamic \
 ))
 endif
-else # Solaris/Xsun
-$(eval $(call gb_Library_add_defs,vclplug_gen,\
--DUSE_XINERAMA_XSUN \
-))
-endif
 endif # USE_XINERAMA
 
 ifeq ($(OS),LINUX)
diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 73c7b1f..91c5706 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -44,14 +44,6 @@
 
 #ifdef USE_XINERAMA_XORG
 #include 
-#elif defined USE_XINERAMA_XSUN
-#if defined(SOLARIS) && defined(INTEL) // missing extension header in standard 
installation
-#define MAXFRAMEBUFFERS   16
-Bool XineramaGetState(Display*, int);
-Status XineramaGetInfo(Display*, int, XRectangle*, unsigned char*, int*);
-#else
-#include 
-#endif
 #endif
 
 #include 
@@ -2228,30 +2220,7 @@ void SalDisplay::InitXinerama()
 m_bXinerama = false;
 return; // multiple screens mean no xinerama
 }
-#if defined(USE_XINERAMA_XSUN)
-int nFramebuffers = 1;
-if( XineramaGetState( pDisp_, m_nDefaultScreen ) )
-{
-XRectangle pFramebuffers[MAXFRAMEBUFFERS];
-unsigned char hints[MAXFRAMEBUFFERS];
-int result = XineramaGetInfo( pDisp_,
-  m_nDefaultScreen,
-  pFramebuffers,
-  hints,
-  &nFramebuffers );
-if( result > 0 && nFramebuffers > 1 )
-{
-m_bXinerama = true;
-m_aXineramaScreens = std::vector();
-m_aXineramaScreenIndexMap = std::vector(nFramebuffers);
-for( int i = 0; i < nFramebuffers; i++ )
-addXineramaScreenUnique( i, pFramebuffers[i].x,
- pFramebuffers[i].y,
- pFramebuffers[i].width,
- pFramebuffers[i].height );
-}
-}
-#elif defined(USE_XINERAMA_XORG)
+#if defined(USE_XINERAMA_XORG)
 if( XineramaIsActive( pDisp_ ) )
 {
 int nFramebuffers = 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Miklos Vajna]

 sw/source/filter/ww8/docxattributeoutput.cxx  |3 +
 writerfilter/source/dmapper/DomainMapper.cxx  |   59 ++
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 
 writerfilter/source/dmapper/PropertyIds.cxx   |2 
 writerfilter/source/dmapper/PropertyIds.hxx   |2 
 writerfilter/source/dmapper/PropertyMap.cxx   |   53 ++-
 writerfilter/source/dmapper/PropertyMap.hxx   |1 
 7 files changed, 117 insertions(+), 5 deletions(-)

New commits:
commit 942f1ed93c4e26e883b7d1d3ee6b729ef72cec67
Author: Miklos Vajna 
Date:   Wed Aug 6 13:20:19 2014 +0200

DOCX import: handle  cell property

Change-Id: I849daf0ddee370775fda73e04739e69acbc64246

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 051b6c1..6ab6bde 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -3290,6 +3290,9 @@ void DocxAttributeOutput::TableBackgrounds( 
ww8::WW8TableNodeInfoInner::Pointer_
 
 for( aGrabBagElement = aGrabBag.begin(); aGrabBagElement != 
aGrabBag.end(); ++aGrabBagElement )
 {
+if (!aGrabBagElement->second.has())
+continue;
+
 OString sValue = OUStringToOString( 
aGrabBagElement->second.get(), RTL_TEXTENCODING_UTF8 );
 if( aGrabBagElement->first == "themeFill")
 AddToAttrList( aAttrList, FSNS( XML_w, XML_themeFill ), 
sValue.getStr() );
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index c89395f..7864dd9 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2504,6 +2504,18 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext )
 }
 }
 break;
+case NS_ooxml::LN_CT_TcPrBase_cnfStyle:
+{
+m_pImpl->enableInteropGrabBag("cnfStyle");
+resourcemodel::resolveSprmProps(*this, rSprm);
+
+TablePropertyMapPtr pPropMap(new TablePropertyMap());
+pPropMap->Insert(PROP_CELL_CNF_STYLE, 
uno::makeAny(uno::makeAny(m_pImpl->m_aInteropGrabBag.getAsConstList())), true, 
CELL_GRAB_BAG);
+m_pImpl->getTableManager().cellProps(pPropMap);
+
+m_pImpl->disableInteropGrabBag();
+}
+break;
 case NS_ooxml::LN_CT_PPrBase_cnfStyle:
 {
 m_pImpl->enableInteropGrabBag("cnfStyle");
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index 6d236c1..c12e97a 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -397,6 +397,7 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) 
const
 case PROP_PARA_SDT_END_BEFORE: sName = "ParaSdtEndBefore"; break;
 case META_PROP_TABLE_LOOK: sName = "TableStyleLook"; break;
 case PROP_PARA_CNF_STYLE: sName = "ParaCnfStyle"; break;
+case PROP_CELL_CNF_STYLE: sName = "CellCnfStyle"; break;
 }
 ::std::pair aInsertIt =
 m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, 
sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx 
b/writerfilter/source/dmapper/PropertyIds.hxx
index 5814c34..0ff6ee3 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -369,6 +369,7 @@ enum PropertyIds
 ,PROP_PARA_SDT_END_BEFORE
 ,META_PROP_TABLE_LOOK
 ,PROP_PARA_CNF_STYLE
+,PROP_CELL_CNF_STYLE
 };
 struct PropertyNameSupplier_Impl;
 class PropertyNameSupplier
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index ab1d48d..62c5ba6 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -66,30 +66,50 @@ uno::Sequence< beans::PropertyValue > 
PropertyMap::GetPropertyValues(bool bCharG
 {
 size_t nCharGrabBag = 0;
 size_t nParaGrabBag = 0;
+size_t nCellGrabBag = 0;
+size_t nCellGrabBagSaved = 0; // How many entries do we save from the 
returned sequence.
 for (MapIterator i = m_vMap.begin(); i != m_vMap.end(); ++i)
 {
 if ( i->second.getGrabBagType() == CHAR_GRAB_BAG )
 nCharGrabBag++;
 else if ( i->second.getGrabBagType() == PARA_GRAB_BAG )
 nParaGrabBag++;
+else if ( i->second.getGrabBagType() == CELL_GRAB_BAG )
+{
+nCellGrabBag++;
+nCellGrabBagSaved++;
+}
+else if ( i->first == PROP_CELL_INTEROP_GRAB_BAG)
+{
+uno::Sequence aSeq;
+i->second.getValue() >>= aSeq;
+nCellGrabBag += aSeq.getLength();
+nCellGrabBagSaved++;
+}
 }
 
 // In case there ar

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

[Palenik Mihály]

 dbaccess/UIConfig_dbaccess.mk  |1 
 dbaccess/source/ui/dlg/dbadmin.src |   34 --
 dbaccess/source/ui/dlg/detailpages.cxx |   30 -
 dbaccess/source/ui/dlg/detailpages.hxx |5 
 dbaccess/uiconfig/ui/odbcpage.ui   |  178 +
 5 files changed, 185 insertions(+), 63 deletions(-)

New commits:
commit f71d65f39eac01374bb96d6305a7b21bd4fc
Author: Palenik Mihály 
Date:   Wed Aug 6 12:50:18 2014 +0200

Convert PAGE_ODBC to .ui

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

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 3373b84..2ab2a66 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/migratepage \
 dbaccess/uiconfig/ui/mysqlnativepage \
 dbaccess/uiconfig/ui/mysqlnativesettings \
+dbaccess/uiconfig/ui/odbcpage \
 dbaccess/uiconfig/ui/parametersdialog \
 dbaccess/uiconfig/ui/password \
 dbaccess/uiconfig/ui/preparepage \
diff --git a/dbaccess/source/ui/dlg/dbadmin.src 
b/dbaccess/source/ui/dlg/dbadmin.src
index 7d38b0a..f81b75a 100644
--- a/dbaccess/source/ui/dlg/dbadmin.src
+++ b/dbaccess/source/ui/dlg/dbadmin.src
@@ -87,40 +87,6 @@ TabPage PAGE_ADO
 AUTO_CHARSET(UNRELATED_CONTROLS,PAGE_X)
 };
 
-TabPage PAGE_ODBC
-{
-SVLook = TRUE ;
-Pos = MAP_APPFONT ( 0 , 0 ) ;
-Size = MAP_APPFONT ( PAGE_X , PAGE_Y ) ;
-Hide = TRUE;
-HelpId = HID_DSADMIN_PAGE_ODBC;
-
-AUTO_CHARSET(UNRELATED_CONTROLS,PAGE_X)
-FixedLine FL_SEPARATOR1
-{
-Pos = MAP_APPFONT ( 4 , 2*UNRELATED_CONTROLS + 2*FIXEDTEXT_HEIGHT + 
RELATED_CONTROLS ) ;
-Size = MAP_APPFONT ( PAGE_X - 8 , FIXEDTEXT_HEIGHT ) ;
-Text[ en-US ] = "Optional Settings";
-};
-
-FixedText FT_OPTIONS
-{
-Pos = MAP_APPFONT ( 6 , 2*UNRELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT + 
2*RELATED_CONTROLS) ;
-Size = MAP_APPFONT ( EDIT_X - 7 , FIXEDTEXT_HEIGHT ) ;
-Text [ en-US ] = "ODBC ~options" ;
-};
-Edit ET_OPTIONS
-{
-Border = TRUE ;
-Pos = MAP_APPFONT ( EDIT_X , 2*UNRELATED_CONTROLS + 3*FIXEDTEXT_HEIGHT 
+ 2*RELATED_CONTROLS -1 ) ;
-Size = MAP_APPFONT ( 130 , EDIT_HEIGHT ) ;
-TabStop = TRUE ;
-HelpId = HID_DSADMIN_ODBC_OPTIONS;
-};
-
-AUTO_USECATALOG(3*UNRELATED_CONTROLS + 4*FIXEDTEXT_HEIGHT + 
2*RELATED_CONTROLS )
-};
-
 TabPage PAGE_MYSQL_ODBC
 {
 HelpID = "dbaccess:TabPage:PAGE_MYSQL_ODBC";
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx 
b/dbaccess/source/ui/dlg/detailpages.cxx
index 3bcedeb..0664f1e 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -336,20 +336,10 @@ namespace dbaui
 
 // OOdbcDetailsPage
 OOdbcDetailsPage::OOdbcDetailsPage( Window* pParent, const SfxItemSet& 
_rCoreAttrs )
-:OCommonBehaviourTabPage(pParent, PAGE_ODBC, _rCoreAttrs, 
CBTP_USE_CHARSET | CBTP_USE_OPTIONS,false)
-,m_aFL_1(this, ModuleRes(FL_SEPARATOR1))
-,m_aUseCatalog  (this, ModuleRes(CB_USECATALOG))
+:OCommonBehaviourTabPage(pParent, "ODBC", "dbaccess/ui/odbcpage.ui", 
_rCoreAttrs, CBTP_USE_CHARSET | CBTP_USE_OPTIONS)
 {
-m_aUseCatalog.SetToggleHdl(getControlModifiedLink());
-FreeResource();
-
-Window* pWindows[] = {  m_pCharsetLabel, m_pCharset
-,m_pOptionsLabel,m_pOptions,&m_aUseCatalog
-};
-
-sal_Int32 nCount = sizeof(pWindows) / sizeof(pWindows[0]);
-for (sal_Int32 i=1; i < nCount; ++i)
-pWindows[i]->SetZOrder(pWindows[i-1], WINDOW_ZORDER_BEHIND);
+get(m_pUseCatalog, "useCatalogCheckbutton");
+m_pUseCatalog->SetToggleHdl(getControlModifiedLink());
 }
 
 SfxTabPage* ODriversSettings::CreateODBC( Window* pParent, const 
SfxItemSet* _rAttrSet )
@@ -360,19 +350,9 @@ namespace dbaui
 bool OOdbcDetailsPage::FillItemSet( SfxItemSet* _rSet )
 {
 bool bChangedSomething = OCommonBehaviourTabPage::FillItemSet(_rSet);
-fillBool(*_rSet,&m_aUseCatalog,DSID_USECATALOG,bChangedSomething);
+fillBool(*_rSet,m_pUseCatalog,DSID_USECATALOG,bChangedSomething);
 return bChangedSomething;
 }
-void OOdbcDetailsPage::fillControls(::std::vector< ISaveValueWrapper* >& 
_rControlList)
-{
-OCommonBehaviourTabPage::fillControls(_rControlList);
-_rControlList.push_back(new 
OSaveValueWrapper(&m_aUseCatalog));
-}
-void OOdbcDetailsPage::fillWindows(::std::vector< ISaveValueWrapper* >& 
_rControlList)
-{
-OCommonBehaviourTabPage::fillWindows(_rControlList);
-_rControlList.push_back(new ODisableWrapper(&m_aFL_1));
-}
 void OOdbcDetailsPage::implInitContro

[Libreoffice-commits] core.git: dbaccess/source dbaccess/uiconfig dbaccess/UIConfig_dbaccess.mk extras/source

[Szymon Kłos]

 dbaccess/UIConfig_dbaccess.mk  |2 
 dbaccess/source/ui/inc/WNameMatch.hxx  |   24 +-
 dbaccess/source/ui/inc/WTypeSelect.hxx |   24 +-
 dbaccess/source/ui/inc/dbu_misc.hrc|4 
 dbaccess/source/ui/misc/WCPage.cxx |1 
 dbaccess/source/ui/misc/WColumnSelect.cxx  |1 
 dbaccess/source/ui/misc/WCopyTable.cxx |3 
 dbaccess/source/ui/misc/WExtendPages.cxx   |   11 -
 dbaccess/source/ui/misc/WNameMatch.cxx |  217 ---
 dbaccess/source/ui/misc/WTypeSelect.cxx|  135 +++---
 dbaccess/source/ui/misc/WizardPages.hrc|   48 -
 dbaccess/source/ui/misc/WizardPages.src|  228 +
 dbaccess/uiconfig/ui/namematchingpage.ui   |  226 
 dbaccess/uiconfig/ui/typeselectpage.ui |  180 +++
 extras/source/glade/libreoffice-catalog.xml.in |6 
 15 files changed, 641 insertions(+), 469 deletions(-)

New commits:
commit 3067d228cd0db321868d766c917089540d02678d
Author: Szymon Kłos 
Date:   Tue Aug 5 23:55:21 2014 +0200

TAB_WIZ_TYPE_SELECT and TAB_WIZ_NAME_MATCHING conversion to .ui

Conflicts:
dbaccess/UIConfig_dbaccess.mk
dbaccess/source/ui/misc/WizardPages.src

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

diff --git a/dbaccess/UIConfig_dbaccess.mk b/dbaccess/UIConfig_dbaccess.mk
index 2ab2a66..289cd48 100644
--- a/dbaccess/UIConfig_dbaccess.mk
+++ b/dbaccess/UIConfig_dbaccess.mk
@@ -42,6 +42,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/migratepage \
 dbaccess/uiconfig/ui/mysqlnativepage \
 dbaccess/uiconfig/ui/mysqlnativesettings \
+dbaccess/uiconfig/ui/namematchingpage \
 dbaccess/uiconfig/ui/odbcpage \
 dbaccess/uiconfig/ui/parametersdialog \
 dbaccess/uiconfig/ui/password \
@@ -62,6 +63,7 @@ $(eval $(call gb_UIConfig_add_uifiles,dbaccess, \
 dbaccess/uiconfig/ui/tablesjoindialog \
 dbaccess/uiconfig/ui/textconnectionsettings \
 dbaccess/uiconfig/ui/textpage \
+dbaccess/uiconfig/ui/typeselectpage \
 dbaccess/uiconfig/ui/useradmindialog \
 dbaccess/uiconfig/ui/useradminpage \
 ))
diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx 
b/dbaccess/source/ui/inc/WNameMatch.hxx
index 055a488..0c713685 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.hxx
@@ -36,7 +36,7 @@ namespace dbaui
 virtual void InitEntry(SvTreeListEntry* pEntry, const OUString& rStr, 
const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind) 
SAL_OVERRIDE;
 
 public:
-OColumnTreeBox( Window* pParent, const ResId& rResId );
+OColumnTreeBox( Window* pParent, WinBits nBits = WB_BORDER );
 
 void FillListBox( const ODatabaseExport::TColumnVector& _rList);
 void SetReadOnly(bool _bRo=true) { m_bReadOnly = _bRo; }
@@ -50,18 +50,20 @@ namespace dbaui
 // Name matching for data appending
 class OWizNameMatching : public OWizardPage
 {
-FixedText   m_FT_TABLE_LEFT;
-FixedText   m_FT_TABLE_RIGHT;
-OColumnTreeBox  m_CTRL_LEFT;// left side
-OColumnTreeBox  m_CTRL_RIGHT;   // right side
-ImageButton m_ibColumn_up;
-ImageButton m_ibColumn_down;
-ImageButton m_ibColumn_up_right;
-ImageButton m_ibColumn_down_right;
-PushButton  m_pbAll;
-PushButton  m_pbNone;
+FixedText   *m_pTABLE_LEFT;
+FixedText   *m_pTABLE_RIGHT;
+OColumnTreeBox  *m_pCTRL_LEFT;// left side
+OColumnTreeBox  *m_pCTRL_RIGHT;   // right side
+PushButton  *m_pColumn_up;
+PushButton  *m_pColumn_down;
+PushButton  *m_pColumn_up_right;
+PushButton  *m_pColumn_down_right;
+PushButton  *m_pAll;
+PushButton  *m_pNone;
 OUStringm_sSourceText;
 OUStringm_sDestText;
+Image   m_aImgUp;
+Image   m_aImgDown;
 
 DECL_LINK( ButtonClickHdl, Button * );
 DECL_LINK( RightButtonClickHdl, Button * );
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx 
b/dbaccess/source/ui/inc/WTypeSelect.hxx
index 58138e3..5e498d1 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -37,6 +37,7 @@ namespace dbaui
 class OWizTypeSelectControl : public OFieldDescControl
 {
 protected:
+Window* m_pParentTabPage;
 virtual voidActivateAggregate( EControlType eType ) 
SAL_OVERRIDE;
 virtual voidDeactivateAggregate( EControlType eType ) 
SAL_OVERRIDE;
 
@@ -50,7 +51,7 @@ namespa

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

[Miklos Vajna]

 writerfilter/source/dmapper/DomainMapper.cxx |   12 
 writerfilter/source/dmapper/PropertyIds.cxx  |1 +
 writerfilter/source/dmapper/PropertyIds.hxx  |1 +
 writerfilter/source/dmapper/PropertyMap.cxx  |   22 +-
 writerfilter/source/dmapper/PropertyMap.hxx  |1 +
 5 files changed, 36 insertions(+), 1 deletion(-)

New commits:
commit 3c01c88adc359102cb45f46e848bdb1ae652f573
Author: Miklos Vajna 
Date:   Wed Aug 6 15:12:42 2014 +0200

DOCX import: handle  row property

Change-Id: I178cb5591c95cc5587ac56662abf808bfca7a336

diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 7864dd9..40c3afa 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -2504,6 +2504,18 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, 
PropertyMapPtr rContext )
 }
 }
 break;
+case NS_ooxml::LN_CT_TrPrBase_cnfStyle:
+{
+m_pImpl->enableInteropGrabBag("cnfStyle");
+resourcemodel::resolveSprmProps(*this, rSprm);
+
+TablePropertyMapPtr pPropMap(new TablePropertyMap());
+pPropMap->Insert(PROP_ROW_CNF_STYLE, 
uno::makeAny(uno::makeAny(m_pImpl->m_aInteropGrabBag.getAsConstList())), true, 
ROW_GRAB_BAG);
+m_pImpl->getTableManager().insertRowProps(pPropMap);
+
+m_pImpl->disableInteropGrabBag();
+}
+break;
 case NS_ooxml::LN_CT_TcPrBase_cnfStyle:
 {
 m_pImpl->enableInteropGrabBag("cnfStyle");
diff --git a/writerfilter/source/dmapper/PropertyIds.cxx 
b/writerfilter/source/dmapper/PropertyIds.cxx
index c12e97a..e95eaec 100644
--- a/writerfilter/source/dmapper/PropertyIds.cxx
+++ b/writerfilter/source/dmapper/PropertyIds.cxx
@@ -398,6 +398,7 @@ OUString PropertyNameSupplier::GetName( PropertyIds eId ) 
const
 case META_PROP_TABLE_LOOK: sName = "TableStyleLook"; break;
 case PROP_PARA_CNF_STYLE: sName = "ParaCnfStyle"; break;
 case PROP_CELL_CNF_STYLE: sName = "CellCnfStyle"; break;
+case PROP_ROW_CNF_STYLE: sName = "RowCnfStyle"; break;
 }
 ::std::pair aInsertIt =
 m_pImpl->aNameMap.insert( PropertyNameMap_t::value_type( eId, 
sName ));
diff --git a/writerfilter/source/dmapper/PropertyIds.hxx 
b/writerfilter/source/dmapper/PropertyIds.hxx
index 0ff6ee3..f9d65da 100644
--- a/writerfilter/source/dmapper/PropertyIds.hxx
+++ b/writerfilter/source/dmapper/PropertyIds.hxx
@@ -370,6 +370,7 @@ enum PropertyIds
 ,META_PROP_TABLE_LOOK
 ,PROP_PARA_CNF_STYLE
 ,PROP_CELL_CNF_STYLE
+,PROP_ROW_CNF_STYLE
 };
 struct PropertyNameSupplier_Impl;
 class PropertyNameSupplier
diff --git a/writerfilter/source/dmapper/PropertyMap.cxx 
b/writerfilter/source/dmapper/PropertyMap.cxx
index 62c5ba6..e36dc1c 100644
--- a/writerfilter/source/dmapper/PropertyMap.cxx
+++ b/writerfilter/source/dmapper/PropertyMap.cxx
@@ -68,6 +68,7 @@ uno::Sequence< beans::PropertyValue > 
PropertyMap::GetPropertyValues(bool bCharG
 size_t nParaGrabBag = 0;
 size_t nCellGrabBag = 0;
 size_t nCellGrabBagSaved = 0; // How many entries do we save from the 
returned sequence.
+size_t nRowGrabBag = 0;
 for (MapIterator i = m_vMap.begin(); i != m_vMap.end(); ++i)
 {
 if ( i->second.getGrabBagType() == CHAR_GRAB_BAG )
@@ -86,6 +87,8 @@ uno::Sequence< beans::PropertyValue > 
PropertyMap::GetPropertyValues(bool bCharG
 nCellGrabBag += aSeq.getLength();
 nCellGrabBagSaved++;
 }
+else if ( i->second.getGrabBagType() == ROW_GRAB_BAG )
+nRowGrabBag++;
 }
 
 // In case there are properties to be grab-bagged and we can have a 
char grab-bag, allocate one slot for it.
@@ -94,21 +97,26 @@ uno::Sequence< beans::PropertyValue > 
PropertyMap::GetPropertyValues(bool bCharG
 nCharGrabBagSize = nCharGrabBag ? 1 : 0;
 size_t nParaGrabBagSize = nParaGrabBag ? 1 : 0;
 size_t nCellGrabBagSize = nCellGrabBag ? 1 : 0;
+size_t nRowGrabBagSize = nRowGrabBag ? 1 : 0;
 
 // If there are any grab bag properties, we need one slot for them.
 m_aValues.realloc( m_vMap.size() - nCharGrabBag + nCharGrabBagSize
   - nParaGrabBag + nParaGrabBagSize
-  - nCellGrabBagSaved + nCellGrabBagSize);
+  - nCellGrabBagSaved + nCellGrabBagSize
+  - nRowGrabBag + nRowGrabBagSize);
 ::com::sun::star::beans::PropertyValue* pValues = m_aValues.getArray();
 uno::Sequence aCharGrabBagValues(nCharGrabBag);
 uno::Sequence aParaGrabBagValues(nParaGrabBag);
 uno::Sequence aCellGrabBagValues(nCellGrabBag);
+uno::Sequence aRowGrabBagValues(nRowGrabBag);
 beans::PropertyValue* pCharGrabBagValues = 
aCharGrabBagValue

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

[Stephan Bergmann]

 chart2/source/view/main/ChartView.cxx |   32 +++-
 1 file changed, 31 insertions(+), 1 deletion(-)

New commits:
commit b7a46a22b6a0a5429adec015255ce76e41dced41
Author: Stephan Bergmann 
Date:   Wed Aug 6 15:40:42 2014 +0200

Revert "bnc#886540: Let's not push the available area down when no titles 
are there."

This reverts commit b398ed8e3f95b75705bb2e53d49589ef7fdbb1c7:  "Aug 06 
10:11:53
 moggi, b398ed8e3f95b75705bb2e53d49589ef7fdbb1c7 broke
CppunitTest_chart2_xshape, very many attributes in
chart2/qa/extras/xshape/data/reference/fdo75075.xml have wrong values now;
what's the best way to fix? manually fixing fdo75075.xml (assuming the new
values are even correct?) looks /very/ tedious.  better revert the commit 
for
now?"

diff --git a/chart2/source/view/main/ChartView.cxx 
b/chart2/source/view/main/ChartView.cxx
index 902705b..9086abc 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -2301,7 +2301,37 @@ boost::shared_ptr lcl_createTitle( 
TitleHelper::eTitleType eType
 break;
 }
 }
-
+else
+{
+// #i109336# Improve auto positioning in chart
+switch ( eAlignment )
+{
+case ALIGN_TOP:
+{
+rRemainingSpace.Y += nYDistance;
+rRemainingSpace.Height -= nYDistance;
+}
+break;
+case ALIGN_BOTTOM:
+{
+rRemainingSpace.Height -= nYDistance;
+}
+break;
+case ALIGN_LEFT:
+{
+rRemainingSpace.X += nXDistance;
+rRemainingSpace.Width -= nXDistance;
+}
+break;
+case ALIGN_RIGHT:
+{
+rRemainingSpace.Width -= nXDistance;
+}
+break;
+default:
+break;
+}
+}
 return apVTitle;
 }
 
___
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' - filter/source

[Maxim Monastirsky]

 filter/source/xsltfilter/XSLTFilter.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit e9affcdc32fe6796b60b5b4d484b296f70e745b2
Author: Maxim Monastirsky 
Date:   Wed Aug 6 12:30:22 2014 +0300

fdo#45418 xslt: Make sure we're reading from the beginning

Change-Id: Id5beb6af8c32ab45d7e31120d38966f8fe4d5418
(cherry picked from commit b7325b907edf0cd8e2ca577e9796c1cf7d56bd70)
Reviewed-on: https://gerrit.libreoffice.org/10786
Reviewed-by: David Tardon 
Tested-by: David Tardon 

diff --git a/filter/source/xsltfilter/XSLTFilter.cxx 
b/filter/source/xsltfilter/XSLTFilter.cxx
index 26cb3a0..4c769e8 100644
--- a/filter/source/xsltfilter/XSLTFilter.cxx
+++ b/filter/source/xsltfilter/XSLTFilter.cxx
@@ -58,6 +58,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -338,6 +339,10 @@ namespace XSLT
 {
 try
 {
+css::uno::Reference 
xSeek(xInputStream, UNO_QUERY);
+if (xSeek.is())
+xSeek->seek(0);
+
 // we want to be notfied when the processing is done...
 
m_tcontrol->addListener(css::uno::Reference (
 this));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 dbaccess/source/core/api/RowSet.cxx |4 
 1 file changed, 4 insertions(+)

New commits:
commit 1e1b2c563d23eb59ceea8ba07335878aab5b1386
Author: Lionel Elie Mamane 
Date:   Wed Aug 6 15:33:46 2014 +0200

Don't leak the previous cache

Change-Id: I61cb1c608a7de8efc63533085e86c6c17c05f545
Reviewed-on: https://gerrit.libreoffice.org/10793
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/dbaccess/source/core/api/RowSet.cxx 
b/dbaccess/source/core/api/RowSet.cxx
index e31879e..388e153 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -1701,6 +1701,10 @@ Reference< XResultSet > 
ORowSet::impl_prepareAndExecute_throw()
 aComposedUpdateTableName = composeTableName( 
m_xActiveConnection->getMetaData(), m_aUpdateCatalogName, m_aUpdateSchemaName, 
m_aUpdateTableName, false, ::dbtools::eInDataManipulation );
 
 SAL_INFO("dbaccess", "ORowSet::impl_prepareAndExecute_throw: creating 
cache" );
+if(m_pCache)
+{
+DELETEZ(m_pCache);
+}
 m_pCache = new ORowSetCache( xResultSet, m_xComposer.get(), m_aContext, 
aComposedUpdateTableName, m_bModified, 
m_bNew,m_aParameterValueForCache,m_aFilter,m_nMaxRows );
 if ( m_nResultSetConcurrency == ResultSetConcurrency::READ_ONLY )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 dbaccess/source/core/api/CRowSetColumn.cxx |   10 +--
 dbaccess/source/core/api/CRowSetColumn.hxx |2 -
 dbaccess/source/core/api/CRowSetDataColumn.cxx |   32 ++---
 dbaccess/source/core/api/CRowSetDataColumn.hxx |7 +++--
 dbaccess/source/core/api/RowSet.cxx|7 +++--
 5 files changed, 24 insertions(+), 34 deletions(-)

New commits:
commit 03a2b4a80c5854bcb8520f2a43e485b98e3eba8f
Author: Lionel Elie Mamane 
Date:   Wed Aug 6 15:17:13 2014 +0200

fdo#82151 when constructing column object, replace m_aCurrentRow by a 
function

The passed m_aCurrentRow becomes out-of-date as soon as the current row 
changes.
This also hides an implementation detail of ORowSet to ORowSet(Data)Column.

Change-Id: Ib9188743e5dd6dec240e9f5fd3fd9655c6761abc
Reviewed-on: https://gerrit.libreoffice.org/10792
Reviewed-by: Lionel Elie Mamane 
Tested-by: Lionel Elie Mamane 

diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx 
b/dbaccess/source/core/api/CRowSetColumn.cxx
index 945b15f..adc3d38 100644
--- a/dbaccess/source/core/api/CRowSetColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetColumn.cxx
@@ -36,9 +36,13 @@ using namespace ::com::sun::star::beans;
 namespace dbaccess
 {
 
-ORowSetColumn::ORowSetColumn(   const Reference < XResultSetMetaData >& 
_xMetaData, const Reference < XRow >& _xRow, sal_Int32 _nPos,
-const Reference< XDatabaseMetaData >& _rxDBMeta, const 
OUString& _rDescription, const OUString& i_sLabel,ORowSetCacheIterator& 
_rColumnValue )
-:ORowSetDataColumn( _xMetaData, _xRow, NULL, _nPos, _rxDBMeta, 
_rDescription, i_sLabel,_rColumnValue )
+ORowSetColumn::ORowSetColumn( const Reference < XResultSetMetaData >& 
_xMetaData,
+  const Reference < XRow >& _xRow, sal_Int32 _nPos,
+  const Reference< XDatabaseMetaData >& _rxDBMeta,
+  const OUString& _rDescription,
+  const OUString& i_sLabel,
+  const boost::function< const 
::connectivity::ORowSetValue& ( sal_Int32 ) > &_getValue )
+:ORowSetDataColumn( _xMetaData, _xRow, NULL, _nPos, _rxDBMeta, 
_rDescription, i_sLabel, _getValue )
 {
 }
 
diff --git a/dbaccess/source/core/api/CRowSetColumn.hxx 
b/dbaccess/source/core/api/CRowSetColumn.hxx
index bba7c7d..0c4ec82 100644
--- a/dbaccess/source/core/api/CRowSetColumn.hxx
+++ b/dbaccess/source/core/api/CRowSetColumn.hxx
@@ -38,7 +38,7 @@ namespace dbaccess
 const ::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMeta,
 const OUString& _rDescription,
 const OUString& i_sLabel,
-ORowSetCacheIterator& _rColumnValue);
+const boost::function< const 
::connectivity::ORowSetValue& ( sal_Int32 ) > &_getValue);
 
 virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const 
SAL_OVERRIDE;
 virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() 
SAL_OVERRIDE;
diff --git a/dbaccess/source/core/api/CRowSetDataColumn.cxx 
b/dbaccess/source/core/api/CRowSetDataColumn.cxx
index f0de794..a047725 100644
--- a/dbaccess/source/core/api/CRowSetDataColumn.cxx
+++ b/dbaccess/source/core/api/CRowSetDataColumn.cxx
@@ -39,16 +39,16 @@ using namespace cppu;
 using namespace osl;
 
 
-ORowSetDataColumn::ORowSetDataColumn(   const Reference < XResultSetMetaData 
>& _xMetaData,
+ORowSetDataColumn::ORowSetDataColumn( const Reference < XResultSetMetaData >& 
_xMetaData,
   const Reference < XRow >& _xRow,
   const Reference < XRowUpdate >& 
_xRowUpdate,
   sal_Int32 _nPos,
   const Reference< XDatabaseMetaData >& 
_rxDBMeta,
   const OUString& _rDescription,
   const OUString& i_sLabel,
-  const ORowSetCacheIterator& 
_rColumnValue)
+  const boost::function< const 
ORowSetValue& (sal_Int32)> &_getValue)
 :ODataColumn(_xMetaData,_xRow,_xRowUpdate,_nPos,_rxDBMeta)
-,m_aColumnValue(_rColumnValue)
+,m_pGetValue(_getValue)
 ,m_sLabel(i_sLabel)
 ,m_aDescription(_rDescription)
 {
@@ -105,16 +105,7 @@ void SAL_CALL ORowSetDataColumn::getFastPropertyValue( 
Any& rValue, sal_Int32 nH
 {
 if ( PROPERTY_ID_VALUE == nHandle )
 {
-if ( !m_aColumnValue.isNull() && m_aColumnValue->is() )
-{
-::osl::Mutex* pMutex = m_aColumnValue.getMutex();
-::osl::MutexGuard aGuard( *pMutex );
-#if OSL_DEBUG_LEVEL > 0
-ORowSetRow aRow = *m_aColumnValue;
-#endif
-OSL_ENSURE((sal_Int32)aRow->get().size() > m_nPos,"Pos is greater 
than size of vector");
-rValue = ((*m_aColu

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

--- Comment #204 from Adam Niedling  ---
Would it be possible not to move unfixed bugs from MAB lists? People like me
are trying to find a stable version of LO to install on office computers. But
if MAB lists are cleared then there is no way of knowing how stable each
version is. If stableness can be measured by the number of MAB bugs that is.

Since the MAB4.1 has been cleared so just how stable 4.1 is? 4.2 is supposed to
be stable (still?) but just look at the number of MAB Bugs.

At least please don't clear this list until 4.2 reaches its EOL.

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

--- Comment #205 from Adam Niedling  ---
"At least please don't clear this list until 4.2 reaches its EOL."

What I meant to say is that please don't clear this list until 4.3 becomes
stable (or still).

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

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

[Andrzej Hunt]

 sot/source/base/formats.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 46e03df0a7471a887e7cf403765b4de3582d9a1e
Author: Andrzej Hunt 
Date:   Wed Aug 6 16:00:28 2014 +0200

fdo#81835 Don't prefer GDI Metafiles to RTF/HTML -- correctly.

Was first introduced by 538c13f3d1756f2d105115f64ab1bc0b7426eebc

We should process clipboard formats in order of descriptive-/
usefulness -- however png/bmp are special cases (as browsers
will add an html equivalent to their clipboard when copying raw
images, with the raw image being the preferred target format)
and were therefore moved up in the paste-preference list,
mistakenly it was assumed that GDI Metafiles should be subject
to the same treatment, but it appears that Word (and Wordpad?)
will provide both RTF (preferred) and GDI for formatted text.

Change-Id: I731986fc9d70e7aeb64e53764e32cfec3e27eca1

diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 753e738..75ce447 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -857,7 +857,6 @@ static SotAction_Impl const 
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] =  \
 { SOT_FORMATSTR_ID_SD_OLE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
 { SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
-{ SOT_FORMAT_GDIMETAFILE, EXCHG_OUT_ACTION_INSERT_GDIMETAFILE | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_PNG, EXCHG_OUT_ACTION_INSERT_BITMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMAT_BITMAP, EXCHG_OUT_ACTION_INSERT_BITMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
@@ -869,6 +868,7 @@ static SotAction_Impl const 
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] =  \
 { SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, 
EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
 { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, 
EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, FILEGRPDSC_ONLY_URL },\
 { SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR, 
EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+{ SOT_FORMAT_GDIMETAFILE, EXCHG_OUT_ACTION_INSERT_GDIMETAFILE | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_EMBED_SOURCE_OLE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
 { SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
 { SOT_FORMATSTR_ID_LINK, EXCHG_OUT_ACTION_INSERT_DDE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
commit 95cad2e05fe7b5b93dff0fecfbeb44bcab44ab81
Author: Andrzej Hunt 
Date:   Wed Aug 6 15:58:15 2014 +0200

Revert "fdo#81835 Don't prefer GDI Metafiles to RTF/HTML"

Accidentally removed GDI metafiles from calc too.

This reverts commit a96a7ce51aa98fb9ee97ea3803e2b7e648611008.

diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index c61508e..753e738 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -857,6 +857,7 @@ static SotAction_Impl const 
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] =  \
 { SOT_FORMATSTR_ID_SD_OLE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
 { SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
+{ SOT_FORMAT_GDIMETAFILE, EXCHG_OUT_ACTION_INSERT_GDIMETAFILE | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_PNG, EXCHG_OUT_ACTION_INSERT_BITMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMAT_BITMAP, EXCHG_OUT_ACTION_INSERT_BITMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
@@ -868,7 +869,6 @@ static SotAction_Impl const 
aEX

[Bug 65675] LibreOffice 4.2 most annoying bugs

[bugzilla-daemon]

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

--- Comment #206 from sophie  ---
(In reply to comment #204)
> Would it be possible not to move unfixed bugs from MAB lists? People like me
> are trying to find a stable version of LO to install on office computers.
> But if MAB lists are cleared then there is no way of knowing how stable each
> version is. If stableness can be measured by the number of MAB bugs that is.
> 
> Since the MAB4.1 has been cleared so just how stable 4.1 is? 4.2 is supposed
> to be stable (still?) but just look at the number of MAB Bugs.
> 
> At least please don't clear this list until 4.2 reaches its EOL.

Please, don't discuss this on the MAB list. MAB is a tool for QA and
developers, if you want your own list, you can build it by yourself using named
tag in Bugzilla, see at the very bottom this page. 
Sophie

-- 
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' - sot/source

[Andrzej Hunt]

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

New commits:
commit 3040f24281a2a26ebc63bb4606a16fed2e597c4d
Author: Andrzej Hunt 
Date:   Wed Aug 6 16:00:28 2014 +0200

fdo#81835 Don't prefer GDI Metafiles to RTF/HTML -- correctly.

Was first introduced by 538c13f3d1756f2d105115f64ab1bc0b7426eebc

We should process clipboard formats in order of descriptive-/
usefulness -- however png/bmp are special cases (as browsers
will add an html equivalent to their clipboard when copying raw
images, with the raw image being the preferred target format)
and were therefore moved up in the paste-preference list,
mistakenly it was assumed that GDI Metafiles should be subject
to the same treatment, but it appears that Word (and Wordpad?)
will provide both RTF (preferred) and GDI for formatted text.

Change-Id: I731986fc9d70e7aeb64e53764e32cfec3e27eca1
Reviewed-on: https://gerrit.libreoffice.org/10768
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 753e738..75ce447 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -857,7 +857,6 @@ static SotAction_Impl const 
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] =  \
 { SOT_FORMATSTR_ID_SD_OLE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
 { SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
-{ SOT_FORMAT_GDIMETAFILE, EXCHG_OUT_ACTION_INSERT_GDIMETAFILE | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_PNG, EXCHG_OUT_ACTION_INSERT_BITMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMAT_BITMAP, EXCHG_OUT_ACTION_INSERT_BITMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
@@ -869,6 +868,7 @@ static SotAction_Impl const 
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] =  \
 { SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, 
EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
 { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, 
EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, FILEGRPDSC_ONLY_URL },\
 { SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR, 
EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+{ SOT_FORMAT_GDIMETAFILE, EXCHG_OUT_ACTION_INSERT_GDIMETAFILE | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_EMBED_SOURCE_OLE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
 { SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
 { SOT_FORMATSTR_ID_LINK, EXCHG_OUT_ACTION_INSERT_DDE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
___
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' - sot/source

[Andrzej Hunt]

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

New commits:
commit 0650c251422b8b4f2485a33d0d5e39955981bf2d
Author: Andrzej Hunt 
Date:   Wed Aug 6 16:00:28 2014 +0200

fdo#81835 Don't prefer GDI Metafiles to RTF/HTML -- correctly.

Was first introduced by 538c13f3d1756f2d105115f64ab1bc0b7426eebc

We should process clipboard formats in order of descriptive-/
usefulness -- however png/bmp are special cases (as browsers
will add an html equivalent to their clipboard when copying raw
images, with the raw image being the preferred target format)
and were therefore moved up in the paste-preference list,
mistakenly it was assumed that GDI Metafiles should be subject
to the same treatment, but it appears that Word (and Wordpad?)
will provide both RTF (preferred) and GDI for formatted text.

Change-Id: I731986fc9d70e7aeb64e53764e32cfec3e27eca1
Reviewed-on: https://gerrit.libreoffice.org/10769
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sot/source/base/formats.cxx b/sot/source/base/formats.cxx
index 1f20c24..fc985e2 100644
--- a/sot/source/base/formats.cxx
+++ b/sot/source/base/formats.cxx
@@ -857,7 +857,6 @@ static SotAction_Impl const 
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] =  \
 { SOT_FORMATSTR_ID_SD_OLE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_EMBED_SOURCE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
 { SOT_FORMATSTR_ID_EMBEDDED_OBJ, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
-{ SOT_FORMAT_GDIMETAFILE, EXCHG_OUT_ACTION_INSERT_GDIMETAFILE | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_PNG, EXCHG_OUT_ACTION_INSERT_BITMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMAT_BITMAP, EXCHG_OUT_ACTION_INSERT_BITMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_HTML, EXCHG_OUT_ACTION_INSERT_HTML | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
@@ -869,6 +868,7 @@ static SotAction_Impl const 
aEXCHG_DEST_SWDOC_FREE_AREA_Copy[] =  \
 { SOT_FORMATSTR_ID_NETSCAPE_BOOKMARK, 
EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
 { SOT_FORMATSTR_ID_FILEGRPDESCRIPTOR, 
EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, FILEGRPDSC_ONLY_URL },\
 { SOT_FORMATSTR_ID_UNIFORMRESOURCELOCATOR, 
EXCHG_OUT_ACTION_INSERT_HYPERLINK | EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 },\
+{ SOT_FORMAT_GDIMETAFILE, EXCHG_OUT_ACTION_INSERT_GDIMETAFILE | 
EXCHG_OUT_ACTION_FLAG_INSERT_IMAGEMAP | EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 
0 },\
 { SOT_FORMATSTR_ID_EMBED_SOURCE_OLE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
 { SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE, EXCHG_OUT_ACTION_INSERT_OLE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
 { SOT_FORMATSTR_ID_LINK, EXCHG_OUT_ACTION_INSERT_DDE | 
EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL, 0 }, \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 external/nss/UnpackedTarball_nss.mk |3 ++-
 external/nss/ubsan.patch.0  |   13 +
 2 files changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 83e5c3e93d9a6f306973d25f6e0426b5d0d06d07
Author: Stephan Bergmann 
Date:   Wed Aug 6 16:50:11 2014 +0200

left shift of 4276994303 by 32 places cannot be represented in type 'long'

Change-Id: Ie9ddc5a42116720e0602d7fb38360f01b71df69c

diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 11839c4..0f166c9 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -22,7 +22,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
$(if $(filter WNTGCC,$(OS)$(COM)),external/nss/nspr-4.9-build.patch.3 \
external/nss/nss-3.13.3-build.patch.3 \
external/nss/nss.mingw.patch.3) \
-external/nss/nspr-build-config.patch \
+external/nss/nspr-build-config.patch \
+external/nss/ubsan.patch.0 \
 ))
 
 # nss-pem is only needed for internal curl to read the NSS CA database
diff --git a/external/nss/ubsan.patch.0 b/external/nss/ubsan.patch.0
new file mode 100644
index 000..298ca40
--- /dev/null
+++ b/external/nss/ubsan.patch.0
@@ -0,0 +1,13 @@
+--- nss/lib/libpkix/pkix/util/pkix_tools.h
 nss/lib/libpkix/pkix/util/pkix_tools.h
+@@ -1458,8 +1458,8 @@
+ 
+ extern PRLogModuleInfo *pkixLog;
+ 
+-#define PKIX_MAGIC_HEADER   LL_INIT(0xFEEDC0FF, 0xEEFACADE)
+-#define PKIX_MAGIC_HEADER_DESTROYED LL_INIT(0xBAADF00D, 0xDEADBEEF)
++#define PKIX_MAGIC_HEADER   LL_INIT(0xFEEDC0FFU, 0xEEFACADEU)
++#define PKIX_MAGIC_HEADER_DESTROYED LL_INIT(0xBAADF00DU, 0xDEADBEEFU)
+ 
+ /* see source file for function documentation */
+ 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/source sw/uiconfig sw/UIConfig_swriter.mk

[Szymon Kłos]

 sw/AllLangResTarget_sw.mk   |1 
 sw/UIConfig_swriter.mk  |1 
 sw/source/ui/envelp/mailmrge.cxx|  476 ++--
 sw/source/ui/envelp/mailmrge.hrc|   74 ---
 sw/source/ui/envelp/mailmrge.src|  340 --
 sw/source/uibase/inc/mailmrge.hxx   |   98 +---
 sw/uiconfig/swriter/ui/mailmerge.ui |  837 
 7 files changed, 1044 insertions(+), 783 deletions(-)

New commits:
commit d72a3d46022860f2ffe9f7acb268efe5756b0f13
Author: Szymon Kłos 
Date:   Tue Aug 5 13:42:48 2014 +0200

DLG_MAILMERGE conversion to .ui

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

diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index bf03701..1fd4a17 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/sw/AllLangResTarget_sw.mk
@@ -100,7 +100,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
 sw/source/ui/envelp/envelp.src \
 sw/source/ui/envelp/label.src \
 sw/source/ui/envelp/labfmt.src \
-sw/source/ui/envelp/mailmrge.src \
 sw/source/ui/fldui/fldui.src \
 sw/source/ui/frmdlg/frmui.src \
 sw/source/ui/globdoc/globdoc.src \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 2fa2e70..6af4be8 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -165,6 +165,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/queryrotateintostandarddialog \
sw/uiconfig/swriter/ui/querysavelabeldialog \
sw/uiconfig/swriter/ui/queryshowchangesdialog \
+   sw/uiconfig/swriter/ui/mailmerge \
sw/uiconfig/swriter/ui/mmaddressblockpage \
sw/uiconfig/swriter/ui/mmcreatingdialog \
sw/uiconfig/swriter/ui/mmlayoutpage \
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 2b2bc53..f385dab 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -39,7 +39,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -113,12 +112,12 @@ void SwXSelChgLstnr_Impl::selectionChanged( const 
EventObject&  ) throw (Runtime
 rParent.pImpl->xSelSupp->getSelection() >>= aSelection;
 
 bool bEnable = aSelection.getLength() > 0;
-rParent.aMarkedRB.Enable(bEnable);
+rParent.m_pMarkedRB->Enable(bEnable);
 if(bEnable)
-rParent.aMarkedRB.Check();
-else if(rParent.aMarkedRB.IsChecked())
+rParent.m_pMarkedRB->Check();
+else if(rParent.m_pMarkedRB->IsChecked())
 {
-rParent.aAllRB.Check();
+rParent.m_pAllRB->Check();
 rParent.m_aSelection.realloc(0);
 }
 }
@@ -135,56 +134,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, 
SwWrtShell& rShell,
 const uno::Reference< XConnection>& _xConnection,
 Sequence< Any >* pSelection) :
 
-SvxStandardDialog(pParent, SW_RES(DLG_MAILMERGE)),
-pBeamerWin  (new Window(this, SW_RES(WIN_BEAMER))),
-
-aAllRB  (this, SW_RES(RB_ALL)),
-aMarkedRB   (this, SW_RES(RB_MARKED)),
-aFromRB (this, SW_RES(RB_FROM)),
-aFromNF (this, SW_RES(NF_FROM)),
-aBisFT  (this, SW_RES(FT_BIS)),
-aToNF   (this, SW_RES(NF_TO)),
-aRecordFL   (this, SW_RES(FL_RECORD)),
-
-aSeparatorFL(this, SW_RES(FL_SEPARATOR)),
-
-aPrinterRB  (this, SW_RES(RB_PRINTER)),
-aMailingRB  (this, SW_RES(RB_MAILING)),
-aFileRB (this, SW_RES(RB_FILE)),
-
-aSingleJobsCB   (this, SW_RES(CB_SINGLE_JOBS)),
-
-aSaveMergedDocumentFL(this, SW_RES( FL_SAVE_MERGED_DOCUMENT)),
-aSaveSingleDocRB(this, SW_RES(  RB_SAVE_SINGLE_DOC )),
-aSaveIndividualRB(this, SW_RES( RB_SAVE_INDIVIDUAL )),
-aGenerateFromDataBaseCB(this, SW_RES(   RB_GENERATE_FROM_DATABASE )),
-
-aColumnFT   (this, SW_RES(FT_COLUMN)),
-aColumnLB   (this, SW_RES(LB_COLUMN)),
-
-aPathFT (this, SW_RES(FT_PATH)),
-aPathED (this, SW_RES(ED_PATH)),
-aPathPB (this, SW_RES(PB_PATH)),
-aFilterFT   (this, SW_RES(FT_FILTER)),
-aFilterLB   (this, SW_RES(LB_FILTER)),
-
-aAddressFldLB   (this, SW_RES(LB_ADDRESSFLD)),
-aSubjectFT  (this, SW_RES(FT_SUBJECT)),
-aSubjectED  (this, SW_RES(ED_SUBJECT)),
-aFormatFT   (this, SW_RES(FT_FORMAT)),
-aAttachFT   (this, SW_RES(FT_ATTACH)),
-aAttachED   (this, SW_RES(ED_ATTACH)),
-aAttachPB   (this, SW_RES(PB_ATTACH)),
-aFormatHtmlCB   (this, SW_RES(CB_FORMAT_HTML)),
-aFormatRtfCB(this, SW_RES(CB_FORMAT_RTF)),
-aFormatSwCB (this, SW_RES(CB_FORMAT_SW)),
-aDestFL (this, SW_RES(FL_DEST)),
-
-aBottomSeparatorFL(this, SW_RES(FL_BOTTOM_SEPARATOR)),
-
-aOkBTN  (this, SW_RES(BTN_OK)),
-aCancelBTN  (this, SW_RES(BTN_CANCEL)),
-aHelpBTN(this, 

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

[Miklos Vajna]

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |   19 +
 sw/source/filter/ww8/docxattributeoutput.cxx  |   33 +++
 sw/source/filter/ww8/docxtablestyleexport.cxx |   36 ++
 sw/source/filter/ww8/docxtablestyleexport.hxx |3 ++
 4 files changed, 90 insertions(+), 1 deletion(-)

New commits:
commit 994cca6b4d090abf7b262ab8b16a46528bef6c21
Author: Miklos Vajna 
Date:   Wed Aug 6 16:56:54 2014 +0200

DOCX export: handle  row property

Change-Id: Ice1cf2ce078b130130c44952ec2be0f8642f21a8

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index d595af3..b242714 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -1980,6 +1980,25 @@ DECLARE_OOXMLEXPORT_TEST(testTableThemePreservation, 
"table-theme-preservation.d
 // check that one cell attribute present in the original document has been 
preserved
 assertXPath(pXmlDocument, 
"/w:document/w:body/w:tbl/w:tr[1]/w:tc[1]/w:tcPr/w:tcBorders/*", 1);
 
+// Check that w:cnfStyle row, cell and paragraph property is preserved.
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:trPr/w:cnfStyle", "val", 
"1000");
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:trPr/w:cnfStyle", "firstRow", 
"1");
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:trPr/w:cnfStyle", "lastRow", 
"0");
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:trPr/w:cnfStyle", 
"firstColumn", "0");
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:trPr/w:cnfStyle", 
"lastColumn", "0");
+
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:tc/w:tcPr/w:cnfStyle", "val", 
"0010");
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:tc/w:tcPr/w:cnfStyle", 
"oddVBand", "0");
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:tc/w:tcPr/w:cnfStyle", 
"evenVBand", "0");
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:tc/w:tcPr/w:cnfStyle", 
"oddHBand", "0");
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:tc/w:tcPr/w:cnfStyle", 
"evenHBand", "0");
+
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:tc[2]/w:p/w:pPr/w:cnfStyle", 
"val", "1000");
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:tc[2]/w:p/w:pPr/w:cnfStyle", 
"firstRowFirstColumn", "0");
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:tc[2]/w:p/w:pPr/w:cnfStyle", 
"firstRowLastColumn", "0");
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:tc[2]/w:p/w:pPr/w:cnfStyle", 
"lastRowFirstColumn", "0");
+assertXPath(pXmlDocument, "//w:tbl/w:tr[1]/w:tc[2]/w:p/w:pPr/w:cnfStyle", 
"lastRowLastColumn", "0");
+
 }
 
 DECLARE_OOXMLEXPORT_TEST(testcantSplit, "2_table_doc.docx")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3db0385..92b7b1e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2921,6 +2921,20 @@ void DocxAttributeOutput::StartTableRow( 
ww8::WW8TableNodeInfoInner::Pointer_t p
 TableHeight( pTableTextNodeInfoInner );
 TableCanSplit( pTableTextNodeInfoInner );
 
+const SwTableBox *pTableBox = pTableTextNodeInfoInner->getTableBox();
+const SwTableLine* pTableLine = pTableBox->GetUpper();
+if (const SfxGrabBagItem* pItem = 
sw::util::HasItem(pTableLine->GetFrmFmt()->GetAttrSet(), 
RES_FRMATR_GRABBAG))
+{
+const std::map& rGrabBag = pItem->GetGrabBag();
+std::map::const_iterator it = 
rGrabBag.find("RowCnfStyle");
+if (it != rGrabBag.cend())
+{
+uno::Sequence aAttributes = it->second.get< 
uno::Sequence >();
+m_pTableStyleExport->CnfStyle(aAttributes);
+}
+}
+
+
 m_pSerializer->endElementNS( XML_w, XML_trPr );
 }
 
commit dbaff6d0b62426ef76acb0a08140eab1371381be
Author: Miklos Vajna 
Date:   Wed Aug 6 16:43:50 2014 +0200

DOCX export: handle  cell property

Change-Id: I7ff2411aed76aa74c8c0d111962773e7af12a7df

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index c199240..3db0385 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2783,6 +2783,18 @@ void DocxAttributeOutput::TableCellProperties( 
ww8::WW8TableNodeInfoInner::Point
 FSEND );
 }
 
+if (const SfxGrabBagItem* pItem = 
sw::util::HasItem(pTblBox->GetFrmFmt()->GetAttrSet(), 
RES_FRMATR_GRABBAG))
+{
+const std::map& rGrabBag = pItem->GetGrabBag();
+std::map::const_iterator it = 
rGrabBag.find("CellCnfStyle");
+if (it != rGrabBag.cend())
+{
+uno::Sequence aAttributes = it->second.get< 
uno::Sequence >();
+m_pTableStyleExport->CnfStyle(aAttributes);
+}
+}
+
+
 const SvxBoxItem& rBox = pTblBox->GetFrmFmt( )->GetBox( );
 const SvxBoxItem& rDefaultBox = (*tableFirstCells.rbegin())->getTableBox( 
)->GetFrmFmt( )->GetBox( );
 {
@@ -7819,39 +7

[Libreoffice-commits] core.git: helpcontent2

[David Tardon]

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

New commits:
commit 546a71da750f87cb895ec62f503f0574f53cdafb
Author: David Tardon 
Date:   Wed Aug 6 17:46:02 2014 +0200

Updated core
Project: help  cc5bb5cd5316199307fcafa59583314f040b8733

diff --git a/helpcontent2 b/helpcontent2
index 400d593..cc5bb5c 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 400d593bd7f28ed51f0f3e0d0c9a381436e1ca27
+Subproject commit cc5bb5cd5316199307fcafa59583314f040b8733
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 helpers/help_hid.lst  |   46 ---
 source/text/shared/explorer/database/05030300.xhp |   12 ++---
 source/text/shared/explorer/database/05030400.xhp |   28 +--
 source/text/shared/explorer/database/1102.xhp |4 -
 source/text/shared/explorer/database/1103.xhp |8 +--
 source/text/swriter/01/0115.xhp   |   52 +++---
 6 files changed, 52 insertions(+), 98 deletions(-)

New commits:
commit cc5bb5cd5316199307fcafa59583314f040b8733
Author: David Tardon 
Date:   Wed Aug 6 17:46:02 2014 +0200

update help ids for Mail Merge dialog

Change-Id: Id72168754b58edc5232fd965687652fc3813efc3

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 2d5b291..d33cab6 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -5571,11 +5571,6 @@ sw_CheckBox_DLG_GLOSSARY_CB_FILE_REL,1428636740,
 sw_CheckBox_DLG_GLOSSARY_CB_INSERT_TIP,1428636677,
 sw_CheckBox_DLG_GLOSSARY_CB_NET_REL,1428636741,
 sw_CheckBox_DLG_GLOSSARY_CB_SHOW_EXAMPLE,1428636745,
-sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_HTML,1446609941,
-sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_RTF,1446609942,
-sw_CheckBox_DLG_MAILMERGE_CB_FORMAT_SW,1446609940,
-sw_CheckBox_DLG_MAILMERGE_CB_SINGLE_JOBS,1446609938,
-sw_CheckBox_DLG_MAILMERGE_RB_GENERATE_FROM_DATABASE,1446609961,
 sw_CheckBox_DLG_ROW_HEIGHT_CB_AUTOHEIGHT,1425245186,
 sw_CheckBox_TP_FORMAT_TABLE_CB_REL_WIDTH,878216196,
 sw_CheckBox_TP_LAB_LAB_BOX_ADDR,909689858,
@@ -5604,9 +5599,6 @@ sw_CheckBox_TP_TABLE_TEXTFLOW_CB_SPLIT,878511249,
 sw_Edit_DLG_BIB_BASE_ED_NAME,1428719626,
 sw_Edit_DLG_GLOSSARY_ED_NAME,1428637700,
 sw_Edit_DLG_GLOSSARY_ED_SHORTNAME,1428637698,
-sw_Edit_DLG_MAILMERGE_ED_ATTACH,1446610977,
-sw_Edit_DLG_MAILMERGE_ED_PATH,1446610969,
-sw_Edit_DLG_MAILMERGE_ED_SUBJECT,1446610960,
 sw_Edit_TP_FORMAT_TABLE_ED_NAME,878217319,
 sw_Edit_TP_LINENUMBERING_ED_DIVISOR,87975,
 sw_ImageButton_TP_LAB_LAB_BTN_INSERT,909700627,
@@ -5615,9 +5607,6 @@ sw_ImageButton_TP_TABLE_COLUMN_COL_BTN_UP,888499832,
 sw_ListBox_DLG_BIB_BASE_LB_PATH,1428721160,
 sw_ListBox_DLG_COLUMN_LB_APPLY_TO,1417874998,
 sw_ListBox_DLG_FLD_DROPDOWN_LB_LISTITEMS,1419644418,
-sw_ListBox_DLG_MAILMERGE_LB_ADDRESSFLD,1446612494,
-sw_ListBox_DLG_MAILMERGE_LB_COLUMN,1446612510,
-sw_ListBox_DLG_MAILMERGE_LB_FILTER,1446612524,
 sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINEPOS,877956631,
 sw_ListBox_TP_FOOTNOTE_PAGE_DLB_LINETYPE,877956629,
 sw_ListBox_TP_FORMAT_TABLE_LB_TEXTORIENTATION,878218796,
@@ -5663,8 +5652,6 @@ sw_MetricField_TP_TABLE_COLUMN_ED_SPACE,888494718,
 sw_ModalDialog_DLG_CHANGE_DB,1419591680,
 sw_ModalDialog_DLG_DBSELECTION,1435009024,
 sw_MultiLineEdit_TP_LAB_LAB_EDT_WRITING,909691395,
-sw_NumericField_DLG_MAILMERGE_NF_FROM,1446615045,
-sw_NumericField_DLG_MAILMERGE_NF_TO,1446615047,
 sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_COLS,1411291141,
 sw_NumericField_DLG_PAGEPREVIEW_PRINTOPTIONS_NF_ROWS,1411291139,
 sw_NumericField_TP_LINENUMBERING_NF_DIV_INTERVAL,878893073,
@@ -5684,20 +5671,10 @@ sw_PushButton_DLG_GLOSSARY_PB_PATH,1428640312,
 sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_CLOSE,1972294214,
 
sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_DETAILS,1972294210,
 sw_PushButton_DLG_MAILMERGECHILD_TB_BACK_DLG_MM_SENDMAILS_PB_STOP,1972294213,
-sw_PushButton_DLG_MAILMERGE_PB_ATTACH,1446613538,
-sw_PushButton_DLG_MAILMERGE_PB_PATH,1446613530,
 sw_PushButton_DLG_PAGEPREVIEW_PRINTOPTIONS_PB_STANDARD,1411289624,
 sw_PushButton_DLG_SYNC_BTN_BTN_SYNC,1983500820,
 sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_DEFAULT,879350288,
 sw_PushButton_TP_OPTCOMPATIBILITY_PAGE_PB_RESET,879350287,
-sw_RadioButton_DLG_MAILMERGE_RB_ALL,1446609410,
-sw_RadioButton_DLG_MAILMERGE_RB_FILE,1446609431,
-sw_RadioButton_DLG_MAILMERGE_RB_FROM,1446609412,
-sw_RadioButton_DLG_MAILMERGE_RB_MAILING,1446609420,
-sw_RadioButton_DLG_MAILMERGE_RB_MARKED,1446609411,
-sw_RadioButton_DLG_MAILMERGE_RB_PRINTER,1446609419,
-sw_RadioButton_DLG_MAILMERGE_RB_SAVE_INDIVIDUAL,1446609448,
-sw_RadioButton_DLG_MAILMERGE_RB_SAVE_SINGLE_DOC,1446609447,
 sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_LANDSCAPE,1411285528,
 sw_RadioButton_DLG_PAGEPREVIEW_PRINTOPTIONS_RB_PORTRAIT,1411285529,
 sw_RadioButton_TP_FOOTNOTE_PAGE_RB_MAXHEIGHT,877953538,
diff --git a/source/text/swriter/01/0115.xhp 
b/source/text/swriter/01/0115.xhp
index a36dbe8..0eba869 100644
--- a/source/text/swriter/01/0115.xhp
+++ b/source/text/swriter/01/0115.xhp
@@ -37,39 +37,39 @@
 During printing, the database information replaces the corresponding 
database fields (placeholders). For more information about inserting database 
fields refer to the Database tab page under Insert - 
Fields - Other.db browser explorer
 Select a database and table.db 
browser records
 
-Click to create 
one big document containing all data records.save 
as individual documents
-Click to create 
one document for every one data record.generate 
file name from database
-Generate each file 

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

[Szymon Kłos]

 sc/UIConfig_scalc.mk|1 
 sc/inc/sc.hrc   |7 +
 sc/source/ui/inc/conflictsdlg.hrc   |   37 --
 sc/source/ui/inc/conflictsdlg.hxx   |   17 +-
 sc/source/ui/miscdlgs/conflictsdlg.cxx  |  169 
 sc/source/ui/miscdlgs/conflictsdlg.src  |  100 +++-
 sc/uiconfig/scalc/ui/conflictsdialog.ui |  191 
 7 files changed, 273 insertions(+), 249 deletions(-)

New commits:
commit 660931a01916bb1386d5855fffd25d355d2c627c
Author: Szymon Kłos 
Date:   Wed Aug 6 09:34:47 2014 +0200

RID_SCDLG_CONFLICTS conversion to .ui

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

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 423dd8f..0833dc1 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/colwidthdialog \
sc/uiconfig/scalc/ui/condformatmanager \
sc/uiconfig/scalc/ui/conditionalformatdialog \
+   sc/uiconfig/scalc/ui/conflictsdialog \
sc/uiconfig/scalc/ui/consolidatedialog \
sc/uiconfig/scalc/ui/correlationdialog \
sc/uiconfig/scalc/ui/covariancedialog \
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index f420815..228cda8 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -991,7 +991,12 @@
 #define STR_HASH_GOOD   (STR_START + 438)
 #define STR_HASH_REGENERATED(STR_START + 439)
 #define STR_RETYPE  (STR_START + 440)
-#define STR_END (STR_RETYPE)
+
+#define STR_TITLE_CONFLICT  (STR_START + 441)
+#define STR_TITLE_AUTHOR(STR_START + 442)
+#define STR_TITLE_DATE  (STR_START + 443)
+#define STR_UNKNOWN_USER_CONFLICT(STR_START + 444)
+#define STR_END (STR_UNKNOWN_USER_CONFLICT)
 
 #define BMP_START   (STR_END)
 
diff --git a/sc/source/ui/inc/conflictsdlg.hrc 
b/sc/source/ui/inc/conflictsdlg.hrc
deleted file mode 100644
index bbdcd88..000
--- a/sc/source/ui/inc/conflictsdlg.hrc
+++ /dev/null
@@ -1,37 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include 
-
-#define FT_CONFLICTS1
-#define LB_CONFLICTS2
-#define BTN_KEEPMINE3
-#define BTN_KEEPOTHER   4
-#define FL_CONFLICTS5
-#define BTN_KEEPALLMINE 6
-#define BTN_KEEPALLOTHERS   7
-#define BTN_CANCEL  8
-#define BTN_HELP9
-
-#define STR_TITLE_CONFLICT  1
-#define STR_TITLE_AUTHOR2
-#define STR_TITLE_DATE  3
-#define STR_UNKNOWN_USER4
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/conflictsdlg.hxx 
b/sc/source/ui/inc/conflictsdlg.hxx
index 6123dbc..05d16ff 100644
--- a/sc/source/ui/inc/conflictsdlg.hxx
+++ b/sc/source/ui/inc/conflictsdlg.hxx
@@ -116,16 +116,12 @@ public:
 class ScConflictsDlg : public ModalDialog
 {
 private:
-FixedText   maFtConflicts;
-SvSimpleTableContainer m_aLbConflictsContainer;
-SvxRedlinTable  maLbConflicts;
-PushButton  maBtnKeepMine;
-PushButton  maBtnKeepOther;
-FixedLine   maFlConflicts;
-PushButton  maBtnKeepAllMine;
-PushButton  maBtnKeepAllOthers;
-CancelButtonmaBtnCancel;
-HelpButton  maBtnHelp;
+SvSimpleTableContainer *m_pLbConflictsContainer;
+boost::scoped_ptrm_pLbConflicts;
+PushButton  *m_pBtnKeepMine;
+PushButton  *m_pBtnKeepOther;
+PushButton  *m_pBtnKeepAllMine;
+PushButton  *m_pBtnKeepAllOthers;
 
 OUStringmaStrTitleConflict;
 OUStringmaStrTitleAuthor;
@@ -164,7 +160,6 @@ public:
 ScConflictsDlg( Window* pParent, ScViewData* 
pViewData, ScDocument* pSharedDoc, ScConflictsList& rConflictsList );
 virtual ~ScConflictsDlg();
 
-virtual voidResize() SAL_OV

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

[Stephan Bergmann]

 sw/inc/ndtxt.hxx |4 +++-
 sw/inc/node.hxx  |2 +-
 sw/source/core/docnode/node.cxx  |   23 +--
 sw/source/core/docnode/nodes.cxx |2 +-
 sw/source/core/txtnode/ndtxt.cxx |   20 
 5 files changed, 30 insertions(+), 21 deletions(-)

New commits:
commit b75e052d31ec8854cad3bda7d372dcfcd50c9609
Author: Stephan Bergmann 
Date:   Wed Aug 6 18:06:20 2014 +0200

Call SwTxtNode-specific part of DelFrms while SwTxtNode is still SwTxtNode

...when SwCntntNode::DelFrms is called from ~SwTxtNode -> ~SwCntntNode.

* SwCntntNode::DelFrms now needs a flag to distinguish calls from inside
  ~SwCntntNode from other calls.  bIsDisposeAccTable happens to already 
serve
  that purpose, so I reused it, but that may be a bad idea from a semantic 
point
  of view?

* ~SwTxtNode is careful to mimic old behavior and only calls 
DelFrms_TxtNodePart
  if GetDepends() is true; no idea whether that's really necessary, though.

* Shifting the work done by DelFrms_TxtNodePart from within ~SwCntntNode to
  before ~SwTxtNode calls ~SwCntntNode hopefully has no negative 
consequences.

Change-Id: I1532b4cfef7fbf9ba82e64b919a08cbefa335421

diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index dfefc47..a46e8bc 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -72,7 +72,7 @@ typedef std::set< sal_Int32 > SwSoftPageBreakList;
 /// SwTxtNode is a paragraph in the document model.
 class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
 {
-
+friend class SwCntntNode;
 /// For creating the first TextNode.
 friend class SwDoc; ///< CTOR and AppendTxtNode()
 friend class SwNodes;
@@ -181,6 +181,8 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public 
::sfx2::Metadatable
 
 const SwTxtInputFld* GetOverlappingInputFld( const SwTxtAttr& rTxtAttr ) 
const;
 
+void DelFrms_TxtNodePart();
+
 public:
 bool IsWordCountDirty() const;
 bool IsWrongDirty() const;
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 9338608..e7c8c6b 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1284,19 +1284,9 @@ void SwCntntNode::DelFrms( bool bIsDisposeAccTable )
 delete pFrm;
 }
 
-if( IsTxtNode() )
+if( bIsDisposeAccTable && IsTxtNode() )
 {
-((SwTxtNode*)this)->SetWrong( NULL );
-((SwTxtNode*)this)->SetWrongDirty( true );
-
-((SwTxtNode*)this)->SetGrammarCheck( NULL );
-((SwTxtNode*)this)->SetGrammarCheckDirty( true );
-
-((SwTxtNode*)this)->SetSmartTags( NULL );
-((SwTxtNode*)this)->SetSmartTagDirty( true );
-
-((SwTxtNode*)this)->SetWordCountDirty( true );
-((SwTxtNode*)this)->SetAutoCompleteWordDirty( true );
+static_cast(this)->DelFrms_TxtNodePart();
 }
 }
 
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index b9c0821..8489f7c 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -262,6 +262,11 @@ SwTxtNode::~SwTxtNode()
 RemoveFromList();
 
 InitSwParaStatistics( false );
+
+if (GetDepends())
+{
+DelFrms_TxtNodePart();
+}
 }
 
 void SwTxtNode::FileLoadedInitHints()
@@ -1309,6 +1314,21 @@ const SwTxtInputFld* SwTxtNode::GetOverlappingInputFld( 
const SwTxtAttr& rTxtAtt
 return pTxtInputFld;
 }
 
+void SwTxtNode::DelFrms_TxtNodePart()
+{
+SetWrong( NULL );
+SetWrongDirty( true );
+
+SetGrammarCheck( NULL );
+SetGrammarCheckDirty( true );
+
+SetSmartTags( NULL );
+SetSmartTagDirty( true );
+
+SetWordCountDirty( true );
+SetAutoCompleteWordDirty( true );
+}
+
 SwTxtFld* SwTxtNode::GetFldTxtAttrAt(
 const sal_Int32 nIndex,
 const bool bIncludeInputFldAtStart ) const
commit 48c90eb75f4610480be28ecad48953143c7f297a
Author: Stephan Bergmann 
Date:   Wed Aug 6 17:36:25 2014 +0200

SwCntntNode::DelFrms already checks for GetDepends()

Change-Id: I9f7ccd372a570dc4dea98983c51419dce83f8be8

diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 1628967..9338608 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -912,8 +912,7 @@ SwCntntNode::~SwCntntNode()
 {
 // The base class SwClient of SwFrm excludes itself from the dependency 
list!
 // Thus, we need to delete all Frames in the dependency list.
-if( GetDepends() )
-DelFrms(false);
+DelFrms(false);
 
 delete pCondColl;
 
commit 02e462f5b15ff5ca00992349fdbc79689ccb3863
Author: Stephan Bergmann 
Date:   Wed Aug 6 17:35:26 2014 +0200

Remove unused bNeedDel parameter to SwCntntNode::DelFrms

Change-Id: Iedc5e8caafda868db853fdf328fbdc99bbf28e20

diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 4de9d18..d58da5c 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -427,7 +427,7 @@ public:
 

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

[Stephan Bergmann]

 sw/source/core/text/itradj.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 14e81a12b0fa6a7bcd9fb29870db8b8bb67b25dd
Author: Stephan Bergmann 
Date:   Wed Aug 6 18:31:58 2014 +0200

Not every SwGluePortion is an SwFlyPortion

Change-Id: Ia14993cc511cb2569b7110ad5169a977cbf7a200

diff --git a/sw/source/core/text/itradj.cxx b/sw/source/core/text/itradj.cxx
index 82fb1a7..3a9ce0e 100644
--- a/sw/source/core/text/itradj.cxx
+++ b/sw/source/core/text/itradj.cxx
@@ -651,7 +651,7 @@ void SwTxtAdjuster::CalcFlyAdjust( SwLineLayout *pCurrent )
 }
 }
 
-pGlue = (SwFlyPortion*)pPos;
+pGlue = (SwGluePortion*)pPos;
 bComplete = false;
 }
 nLen = nLen + pPos->GetLen();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 canvas/source/factory/cf_service.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5f7f1863e3046eff70444f5a273229e40207c0bd
Author: Stephan Bergmann 
Date:   Wed Aug 6 18:34:57 2014 +0200

Fix *_component_getFactory function type

Change-Id: Ic9cd9e1a8188b810e0db336c5844ffa943f0c7c4

diff --git a/canvas/source/factory/cf_service.cxx 
b/canvas/source/factory/cf_service.cxx
index a432e62..e9c3157 100644
--- a/canvas/source/factory/cf_service.cxx
+++ b/canvas/source/factory/cf_service.cxx
@@ -513,8 +513,8 @@ extern "C" {
 
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL canvasfactory_component_getFactory(
 sal_Char const * pImplName,
-lang::XMultiServiceFactory * pServiceManager,
-registry::XRegistryKey * pRegistryKey )
+void * pServiceManager,
+void * pRegistryKey )
 {
 return ::cppu::component_getFactoryHelper(
 pImplName, pServiceManager, pRegistryKey, s_entries );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[David Tardon]

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

New commits:
commit 510443e9a29b9ea75a60a3c5d430ed814a090a3a
Author: David Tardon 
Date:   Wed Aug 6 18:39:17 2014 +0200

Updated core
Project: help  9411c73cf8ac2f036ce21c99962788e59148158c

diff --git a/helpcontent2 b/helpcontent2
index cc5bb5c..9411c73 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit cc5bb5cd5316199307fcafa59583314f040b8733
+Subproject commit 9411c73cf8ac2f036ce21c99962788e59148158c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[David Tardon]

 helpers/help_hid.lst|5 -
 source/text/shared/guide/collab.xhp |   10 +-
 2 files changed, 5 insertions(+), 10 deletions(-)

New commits:
commit 9411c73cf8ac2f036ce21c99962788e59148158c
Author: David Tardon 
Date:   Wed Aug 6 18:39:17 2014 +0200

update help ids for Resolve Conflicts dlg

Change-Id: I5b682de419e348bfe46ac34fcd1ac72251cbef2d

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index d33cab6..8a97f7f 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -2551,7 +2551,6 @@ HID_RPT_START_IMAGE,64517,
 HID_RPT_START_TITLE,64516,
 HID_RPT_VERT_SCROLLBAR,64459,
 HID_RUBY_DIALOG,34187,
-HID_SCDLG_CONFLICTS,59023,
 HID_SCH_CT_INDICATE,63291,
 HID_SCH_DATA_SERIES_LABEL,63367,
 HID_SCH_LEGEND_POS_BOTTOM,63343,
@@ -5073,10 +5072,6 @@ sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
 sc_ModalDialog_RID_SCDLG_GROUP,1493549056,
 sc_NumericField_RID_SCPAGE_CALC_ED_PREC,957257735,
 sc_NumericField_RID_SCPAGE_CALC_ED_STEPS,957257732,
-sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLMINE,1495585286,
-sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPALLOTHERS,1495585287,
-sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPMINE,1495585283,
-sc_PushButton_RID_SCDLG_CONFLICTS_BTN_KEEPOTHER,1495585284,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATE1904,957252107,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESC10,957252106,
 sc_RadioButton_RID_SCPAGE_CALC_BTN_DATESTD,957252105,
diff --git a/source/text/shared/guide/collab.xhp 
b/source/text/shared/guide/collab.xhp
index accd82f..22d675c 100644
--- a/source/text/shared/guide/collab.xhp
+++ b/source/text/shared/guide/collab.xhp
@@ -64,15 +64,15 @@
 The 
spreadsheet document is in shared mode.
 The user sees 
a message that the document is in shared mode and that some features are not 
available in this mode. The user can disable this message for the future. After 
clicking OK, the document is opened in shared mode.
 Resolve Conflicts dialog
-
+
 If the same contents are changed by different users, the 
Resolve Conflicts dialog opens. For each conflict, decide which changes to 
keep.Keep Mine
-
+
 Keeps your change, voids the other 
change.Keep Other
-
+
 Keeps the change of the other user, voids your 
change.Keep All Mine
-
+
 Keeps all your changes, voids all other 
changes.Keep All Others
-
+
 Keeps the changes of all other users, voids your 
changes.
 Saving 
a shared spreadsheet document
 User A saves a 
shared document. The following conditions can apply:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - include/oox sw/source writerfilter/CustomTarget_source.mk writerfilter/Library_writerfilter.mk writerfilter/source

[Miklos Vajna]

 include/oox/core/fasttokenhandler.hxx   |3 
 sw/source/filter/ww8/docxattributeoutput.cxx|4 
 writerfilter/CustomTarget_source.mk |   14 --
 writerfilter/Library_writerfilter.mk|1 
 writerfilter/source/ooxml/OOXMLFastTokenHandler.cxx |  113 
 writerfilter/source/ooxml/OOXMLFastTokenHandler.hxx |   60 --
 writerfilter/source/ooxml/OOXMLStreamImpl.cxx   |4 
 writerfilter/source/ooxml/factoryimpl_ns.py |3 
 writerfilter/source/ooxml/gperffasttokenhandler.py  |   54 -
 writerfilter/source/ooxml/tokens-to-xml.sed |   19 ---
 10 files changed, 9 insertions(+), 266 deletions(-)

New commits:
commit 998836222cc31aae9e36d695a911996f3972d6b2
Author: Miklos Vajna 
Date:   Wed Aug 6 18:51:16 2014 +0200

fix C++11ism

Change-Id: I93f8bbdc9b0b326fa6334640e1d65b862dba6f22

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 92b7b1e..7af991d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -2787,7 +2787,7 @@ void DocxAttributeOutput::TableCellProperties( 
ww8::WW8TableNodeInfoInner::Point
 {
 const std::map& rGrabBag = pItem->GetGrabBag();
 std::map::const_iterator it = 
rGrabBag.find("CellCnfStyle");
-if (it != rGrabBag.cend())
+if (it != rGrabBag.end())
 {
 uno::Sequence aAttributes = it->second.get< 
uno::Sequence >();
 m_pTableStyleExport->CnfStyle(aAttributes);
@@ -2927,7 +2927,7 @@ void DocxAttributeOutput::StartTableRow( 
ww8::WW8TableNodeInfoInner::Pointer_t p
 {
 const std::map& rGrabBag = pItem->GetGrabBag();
 std::map::const_iterator it = 
rGrabBag.find("RowCnfStyle");
-if (it != rGrabBag.cend())
+if (it != rGrabBag.end())
 {
 uno::Sequence aAttributes = it->second.get< 
uno::Sequence >();
 m_pTableStyleExport->CnfStyle(aAttributes);
commit 9c0e846cd75c1a56e4dec6d55a6d8a0ea591e299
Author: Miklos Vajna 
Date:   Wed Aug 6 17:56:42 2014 +0200

pep8 fixes

Change-Id: Iba89cca1dd06e133d7a23f1695b262209e13cec2

diff --git a/writerfilter/source/ooxml/factoryimpl_ns.py 
b/writerfilter/source/ooxml/factoryimpl_ns.py
index 93db0eb..5263d9f 100644
--- a/writerfilter/source/ooxml/factoryimpl_ns.py
+++ b/writerfilter/source/ooxml/factoryimpl_ns.py
@@ -188,6 +188,7 @@ def idToLabel(idName):
 else:
 return idName
 
+
 def appendValueData(values, name, value):
 first = name[0:1]
 
@@ -196,6 +197,7 @@ def appendValueData(values, name, value):
 
 values[first].append([name, value])
 
+
 def printValueData(values):
 if "" in values:
 output_else = ""
@@ -221,6 +223,7 @@ def printValueData(values):
 print("break;")
 print("}")
 
+
 def factoryGetListValue(nsNode):
 print("""bool OOXMLFactory_%s::getListValue(Id nId, const OUString& 
rValue, sal_uInt32& rOutValue)
 {
commit 446af81d89d22d088415062f55a6dfb87e654223
Author: Miklos Vajna 
Date:   Wed Aug 6 17:48:54 2014 +0200

unused tokens-to-xml.sed

Change-Id: I274cdeddde53472e1d4d2188f88269a70677a1fd

diff --git a/writerfilter/CustomTarget_source.mk 
b/writerfilter/CustomTarget_source.mk
index 6e01355..1ac643c 100644
--- a/writerfilter/CustomTarget_source.mk
+++ b/writerfilter/CustomTarget_source.mk
@@ -63,7 +63,6 @@ 
writerfilter_GEN_ooxml_Model_processed=$(writerfilter_WORK)/ooxml/model_preproce
 
writerfilter_GEN_ooxml_NamespaceIds_hxx=$(writerfilter_WORK)/ooxml/OOXMLnamespaceids.hxx
 writerfilter_GEN_ooxml_QNameToStr_cxx=$(writerfilter_WORK)/ooxml/qnametostr.cxx
 
writerfilter_GEN_ooxml_ResourceIds_hxx=$(writerfilter_WORK)/ooxml/resourceids.hxx
-writerfilter_GEN_ooxml_Token_xml=$(writerfilter_WORK)/ooxml/token.xml
 writerfilter_SRC_ooxml_Model=$(writerfilter_SRC)/ooxml/model.xml
 
writerfilter_SRC_ooxml_Preprocess_py=$(writerfilter_SRC)/ooxml/modelpreprocess.py
 writerfilter_SRC_ooxml_QNameToStr_py=$(writerfilter_SRC)/ooxml/qnametostr.py
@@ -93,11 +92,6 @@ $(writerfilter_GEN_ooxml_ResourceIds_hxx) : 
$(writerfilter_SRC_ooxml_ResourceIds
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,PY ,1)
$(call gb_Helper_abbreviate_dirs, $(writerfilter_PYTHONCOMMAND) 
$(writerfilter_SRC_ooxml_ResourceIds_py) 
$(writerfilter_GEN_ooxml_Model_processed)) > $@
 
-$(writerfilter_GEN_ooxml_Token_xml) : $(SRCDIR)/oox/source/token/tokens.txt 
$(writerfilter_SRC)/ooxml/tokens-to-xml.sed | $(writerfilter_WORK)/ooxml/.dir
-   $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),build,CAT,1)
-   sed -f $(writerfilter_SRC)/ooxml/tokens-to-xml.sed \
-   < $(SRCDIR)/oox/source/token/tokens.txt > $@
-
 $(writerfilter_WORK)/ooxml/OOXMLFactory%.cxx : 
$(writerfilter_SRC)/ooxml/factoryimpl_ns.py 
$(writerfilter_GEN_ooxml_Model_processed)
$(call gb_Output_announce,$(subst $

[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - translations

[Christian Lohmaier]

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

New commits:
commit 2c89b2d236570f76e5baa86f347abdaeae703e07
Author: Christian Lohmaier 
Date:   Wed Aug 6 17:08:33 2014 +0200

Updated core
Project: translations  bd4df3d8b26cd109911f8a3fc56fc99aa8704503

diff --git a/translations b/translations
index 06e1987..bd4df3d 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 06e19877ef0593a52d49212f17b9de03712890ea
+Subproject commit bd4df3d8b26cd109911f8a3fc56fc99aa8704503
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-4-3-1'

[Christian Lohmaier]

New branch 'libreoffice-4-3-1' available with the following commits:
commit 3903a50c3c8017b50bd089fe962c6702e318b3fe
Author: Christian Lohmaier 
Date:   Wed Aug 6 19:20:12 2014 +0200

Branch libreoffice-4-3-1

This is 'libreoffice-4-3-1' - the stable branch for the 4.3.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.3.x release,
please use the 'libreoffice-4-3' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I964ab9ba6e888a0caf17b954af8894e91ab00120

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

[Libreoffice-commits] help.git: Changes to 'libreoffice-4-3-1'

[Christian Lohmaier]

New branch 'libreoffice-4-3-1' available with the following commits:
commit 3a76025dab71c913dd6058e2a8b4bc48ba4cbb69
Author: Christian Lohmaier 
Date:   Wed Aug 6 19:20:12 2014 +0200

Branch libreoffice-4-3-1

This is 'libreoffice-4-3-1' - the stable branch for the 4.3.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.3.x release,
please use the 'libreoffice-4-3' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I9919ac7de62bce87e75845702108978d33f03cd1

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

[Libreoffice-commits] core.git: Changes to 'libreoffice-4-3-1'

[Christian Lohmaier]

New branch 'libreoffice-4-3-1' available with the following commits:
commit c902eaede2bda9adde9b43a8ce68b417ae93f4dc
Author: Christian Lohmaier 
Date:   Wed Aug 6 19:20:24 2014 +0200

Branch libreoffice-4-3-1

This is 'libreoffice-4-3-1' - the stable branch for the 4.3.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.3.x release,
please use the 'libreoffice-4-3' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Iebd2e1398640151de39da536858f3f81e6424208

___
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' - configure.ac

[Christian Lohmaier]

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

New commits:
commit cdff661b2d7a8e453460ea5f265453414202af06
Author: Christian Lohmaier 
Date:   Wed Aug 6 19:21:35 2014 +0200

bump product version to 4.3.2.0.0+

Change-Id: I351a6e4693bfe7baf30296f93f300b31a2f60f07

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

[Libreoffice-commits] translations.git: Changes to 'libreoffice-4-3-1'

[Christian Lohmaier]

New branch 'libreoffice-4-3-1' available with the following commits:
commit 2ad7e26cd290c6aabf99862ae25af48b8cf50626
Author: Christian Lohmaier 
Date:   Wed Aug 6 19:20:12 2014 +0200

Branch libreoffice-4-3-1

This is 'libreoffice-4-3-1' - the stable branch for the 4.3.1 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 4.3.x release,
please use the 'libreoffice-4-3' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ic4c43e3f8af66cc5d72444b733d8e6403a47ae31

___
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-1' - configure.ac

[Christian Lohmaier]

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

New commits:
commit 91437839a2198c69247a34f26e8d0df1e5e9af9f
Author: Christian Lohmaier 
Date:   Wed Aug 6 19:24:54 2014 +0200

bump product version to 4.3.1.1.0+

Change-Id: I12cad4cc95e9d6dc0d21bec47c38420753a7317d

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

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-4.3.1.1'

[Christian Lohmaier]

Tag 'libreoffice-4.3.1.1' created by Christian Lohmaier 
 at 2014-08-06 18:24 -0700

Tag libreoffice-4.3.1.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJT4mS6AAoJEPQ0oe+v7q6jWD0QAK9TJNg+wAH6TGY+u93GmKsM
Ajl+6aUsoFiO4cn6W3gTxo7xdWp0qNH4V7Y7+xQfXje3i6mw85MeZ4puC0IyWDfm
S4pudaa1+a813EvNJeWp0p1BZXRiIr3bW7mJCA7Uk/JhswffT9W/I8AGGs9U4JeQ
nlQIN3KK5I9+PAb+DNaLMowN2I7mVYskF91mbOz/KhNw09aPbibEno0R/j3bV9wk
7fSQEmnK0S7orXJLrKn5e90EGGAgHdWlbbbAzgYGnKyXLoS4/xAVizOWZmcUOke8
Z4vHjJFDxTMj/g5k3nIS0EiKwera+/X0BT0JgBCslm9SFL3b/LsYHAdb+qvQzNPQ
hPBDu8PkayAsc2JC3NZqEO0aFppvXvwvMjfJBcEogHtFXfSXbz1oM3X0R8HHSXLE
7gUIZwZd25ggwTItn1kL54QEbTXBt9XXBTKAMpHr8V1XXSS7G+Zxe/qXd5kOOap3
jRl+3hbBt+7qU8lghQzsV3SoSgIfpdXg7WMCiN+oa7rjm0bEc7xS+HPjY1rCyae9
HCG6aGeH2pmFDtWB7felhzg1+Azg5mgMxLqlnNpmpRcgiTMTuqM+0xSy23Uw5XuR
S/qHIA5KPru7NzJ9PQe3M3TDXiBibnuwIlbQyZpzm1lafRsoiCa4UiXHYjkMjCtD
z+oargg3Sf2q3nrlLLOc
=JpFR
-END PGP SIGNATURE-

Changes since libreoffice-4.3.0.0.beta1-10:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.3.1.1'

[Christian Lohmaier]

Tag 'libreoffice-4.3.1.1' created by Christian Lohmaier 
 at 2014-08-06 18:24 -0700

Tag libreoffice-4.3.1.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJT4mTAAAoJEPQ0oe+v7q6jiL8QAMR6KNdaJKPyCQDm+rWz+Sa3
d3uKxvW0U+YszsrBMttzbNdmA7zMqNXlIlBLQlEiTV/75JeqbnFHnBVH+F1D0Art
hXtQyAtOA7+oc2SNkGk5hp4eOJO7u0q4K9gnmTGYAsV6frsN9lGrkfPhxJMGtfGv
IBLRtUbj92Uwp+rYfWFm/sNFqfhZ0ZrN9Ascr9+afzPAxX49OBkYbwmKmuMQJEHt
l6UzDbPkCD1z4/U9ktC5hiEHYV8Emc38p8PZ0IctleEtjBONZMxAW7PACgevNqcR
3XsWDSdG0LO7uhqjfuRJygnkSBBGtdUxk7i4L+PehIYbfTFQJU7yAnb2Op5XkBfb
3hR2lusbVzmmk5M0almsbu/2JmMQvCYugd2if3T4Hy8HPh7ltdgKU1ju+Uuw7RnI
iozebJlbh7+u6KXibeyNLjUXpZX2V6x62cViomLJ9+dolm5sIMq+pyjszOBdQRPL
OoIm/CTcbqBm43E9j0iuEdotybsYJLkd92cLPDO9oSnM90Ph4bkeCa7sg0A4Qoet
7cNEtvjsidVo880VlogDlbybUhjMn8LjyEskthpx2SZrtEkNdqqKvIXvQYgkokci
bqND/3ux3chmXPzSVslcXJDVJvwlukUzyolO2Wv94CljTstzWaJgdSqgyY5WTbD7
D+HZ4ZNSbrgwGc5gAq/G
=Zpsa
-END PGP SIGNATURE-

Changes since libreoffice-4-3-branch-point-776:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-4.3.1.1'

[Christian Lohmaier]

Tag 'libreoffice-4.3.1.1' created by Christian Lohmaier 
 at 2014-08-06 18:24 -0700

Tag libreoffice-4.3.1.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJT4mSzAAoJEPQ0oe+v7q6j5WUQAM4qaapoi/e2ed5yB3SiDl7Y
R8Ek4zJzANelNLdOiy7gBpBU3If3wm6P5o1zCEf73gqzZoqyjdYaXMTjcDbaV+Ad
o4v77oQDSspZSR3he10bIbTh/GsWBHk8WvmvWpelYScXxriFUobp1XN3GqM4vAcy
3eATvYQgcUp9Cps6wFJB59q+SaL66LsjleyH/DczbQ1KVPgQkTC9EElcTaeQBgxm
L35wntyln4WON848jJBuOZPTrF2DXWr98npZZOxA3wuKUiqlN1Wyn6Z6MboE6H8h
a8lBufhOq3xjWJdm8bX7otBY3poXN4VAXWr1blaDPotOROpJ5cCr79SxP1ULPCvi
hnY0gkrfe7iGxZXfReHdYeLxJVemwEKiHqj3/726bYCl10BT5zJylDznkK3S1ewj
iXiForJdVu6thu4oD9cYLMl2YdEJcFloSGO2tapF2LMtoRS+lfhEICMfpoYeWill
g5pfGidIO4St9fLfnM9ZniToqsQ5V8O8PS5TLB+/w8iqawnxqnUmeionap3DnheP
KATg9z+kipPHO61OkvUliMNr9Y6wtn7hEp/PDMc0De4/3IIXDOBsw+ZcaezOsVLe
N3LXlhaIWmC+X03coXvoK5/X8miNSafgdEX91w6BhzYULgYLgSHElGXMgqxWzFjJ
3hVEIpLhuvyoNon1FA5q
=OX09
-END PGP SIGNATURE-

Changes since libreoffice-4.3.0.0.beta1-5:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-4.3.1.1'

[Christian Lohmaier]

Tag 'libreoffice-4.3.1.1' created by Christian Lohmaier 
 at 2014-08-06 18:24 -0700

Tag libreoffice-4.3.1.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1

iQIcBAABAgAGBQJT4mS9AAoJEPQ0oe+v7q6jcJ0QAKAfjbN91GpmxAYcMOEpVvlF
qfPQpZ9nFd59rzv3Ozd5OFxSJ+2pMIYp1vMTfMDZdNrou/liXcQcpzH8yreyOUnu
GAPHkUTscclqtpwKTNsiD5DCoew5XSsB0qGWHKDMvuJ0nviFWMibzRrD3eihcknD
IhKzJmBUfcFw54dRNMPtYriDdJ/uiGwWqwXQyCtEKAGbTnx2gRwTwPsVekYtKBIN
uSyE8fLdHffhl9ZykKd2yWew2kxz/CHtBTf3PSJVoTJZuFwyewUEx/oRZ4zNQ/OA
TaB8pqt1GP6Ix/JS3aAZO8FomnmQ7C4A5kR4N7Bvo4tE09+M4Ks6BQjzWAJI5MZD
MZbuQYNJqidl6foLP544tVEPox/eBeEYgmtpAdHYSGLRL+fDoEZMi6TnS1pCq2NR
qPFA0JDJ9TZRyhXniuwp/pbI4nl85CTXUyhjCm21RYTPf7XcEHwBNUs5rmO5gpRT
FhcirIMekrYoaCrrK1ici4XPp+tlziBSpI4CfZVJJA6LNAH7aON2J+RPuePnFfPe
8j9JUX5UtZkGXfai9GXVrr7AB3Va2sVb5OS6XvqMdZTx+VqTEhM1++lUXT6RW7dB
ICPeqw2IzdO0lOIsSExkJBXNlg79EwFdCA8xEfUgv0hffIkZtPFy1XPkiuBCAQDh
GBQCZJeffRu90mrVzIBP
=xc8E
-END PGP SIGNATURE-

Changes since libreoffice-4.3.0.0.beta1-15:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/lo-pack-sources

[Christian Lohmaier]

 bin/lo-pack-sources |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5ca2b6fca9eb975886f6796e6086ddf79be387d5
Author: Christian Lohmaier 
Date:   Wed Aug 6 20:11:00 2014 +0200

fdo#82137 don't include working directory in tarballs

as this changes permissions when extracting, and those are restrictive,
since it is a temporary directory

Change-Id: I41b28fe405e5915faeea944eb3cfdbed518ac55d

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index de6a4be..3571638 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -13,6 +13,7 @@ my %module_dirname = (
 "help"  => "helpcontent2",
 "translations"  => "translations"
 );
+my $lo_topdir_name;
 
 # get libreoffice-build version from the given libreoffice-build sources
 sub get_config_version($)
@@ -159,7 +160,7 @@ sub generate_tarball($$$)
 
 print "Creating $tarball...";
 # generate the tarball in the current directory; avoid "./" prefix in the 
stored paths; show progress
-system ("tar -c $tar_compress_option -f $tarball -C $dir --checkpoint=500 
--checkpoint-action=exec=\"echo -n .\" --transform=\"s|^\./||\" .") && 
+system ("tar -c $tar_compress_option -f $tarball -C $dir --checkpoint=500 
--checkpoint-action=exec=\"echo -n .\" $lo_topdir_name") && 
 die "Error: releasing failed: $!\n";
 print "\n";
 }
@@ -351,7 +352,6 @@ my $state_release_version;
 my $lo_core_tempdir;
 my $force;
 my $verbose=1;
-my $lo_topdir_name;
 my %module_tarball_name;
 
 ###
___
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' - bin/lo-pack-sources

[Christian Lohmaier]

 bin/lo-pack-sources |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3f37f7b8b0d99b274e2eadc4eff232ea670cb6fd
Author: Christian Lohmaier 
Date:   Wed Aug 6 20:11:00 2014 +0200

fdo#82137 don't include working directory in tarballs

as this changes permissions when extracting, and those are restrictive,
since it is a temporary directory

Change-Id: I41b28fe405e5915faeea944eb3cfdbed518ac55d
(cherry picked from commit 5ca2b6fca9eb975886f6796e6086ddf79be387d5)

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index de6a4be..3571638 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -13,6 +13,7 @@ my %module_dirname = (
 "help"  => "helpcontent2",
 "translations"  => "translations"
 );
+my $lo_topdir_name;
 
 # get libreoffice-build version from the given libreoffice-build sources
 sub get_config_version($)
@@ -159,7 +160,7 @@ sub generate_tarball($$$)
 
 print "Creating $tarball...";
 # generate the tarball in the current directory; avoid "./" prefix in the 
stored paths; show progress
-system ("tar -c $tar_compress_option -f $tarball -C $dir --checkpoint=500 
--checkpoint-action=exec=\"echo -n .\" --transform=\"s|^\./||\" .") && 
+system ("tar -c $tar_compress_option -f $tarball -C $dir --checkpoint=500 
--checkpoint-action=exec=\"echo -n .\" $lo_topdir_name") && 
 die "Error: releasing failed: $!\n";
 print "\n";
 }
@@ -351,7 +352,6 @@ my $state_release_version;
 my $lo_core_tempdir;
 my $force;
 my $verbose=1;
-my $lo_topdir_name;
 my %module_tarball_name;
 
 ###
___
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' - bin/lo-pack-sources

[Christian Lohmaier]

 bin/lo-pack-sources |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 47cb8a41ffe7221814307ad72e58bdc735c1812c
Author: Christian Lohmaier 
Date:   Wed Aug 6 20:11:00 2014 +0200

fdo#82137 don't include working directory in tarballs

as this changes permissions when extracting, and those are restrictive,
since it is a temporary directory

Change-Id: I41b28fe405e5915faeea944eb3cfdbed518ac55d
(cherry picked from commit 5ca2b6fca9eb975886f6796e6086ddf79be387d5)

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index de6a4be..3571638 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -13,6 +13,7 @@ my %module_dirname = (
 "help"  => "helpcontent2",
 "translations"  => "translations"
 );
+my $lo_topdir_name;
 
 # get libreoffice-build version from the given libreoffice-build sources
 sub get_config_version($)
@@ -159,7 +160,7 @@ sub generate_tarball($$$)
 
 print "Creating $tarball...";
 # generate the tarball in the current directory; avoid "./" prefix in the 
stored paths; show progress
-system ("tar -c $tar_compress_option -f $tarball -C $dir --checkpoint=500 
--checkpoint-action=exec=\"echo -n .\" --transform=\"s|^\./||\" .") && 
+system ("tar -c $tar_compress_option -f $tarball -C $dir --checkpoint=500 
--checkpoint-action=exec=\"echo -n .\" $lo_topdir_name") && 
 die "Error: releasing failed: $!\n";
 print "\n";
 }
@@ -351,7 +352,6 @@ my $state_release_version;
 my $lo_core_tempdir;
 my $force;
 my $verbose=1;
-my $lo_topdir_name;
 my %module_tarball_name;
 
 ###
___
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-1' - bin/lo-pack-sources

[Christian Lohmaier]

 bin/lo-pack-sources |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 780a9b98220a89b48a29526a18a79d365e7f82ce
Author: Christian Lohmaier 
Date:   Wed Aug 6 20:11:00 2014 +0200

fdo#82137 don't include working directory in tarballs

as this changes permissions when extracting, and those are restrictive,
since it is a temporary directory

Change-Id: I41b28fe405e5915faeea944eb3cfdbed518ac55d
(cherry picked from commit 5ca2b6fca9eb975886f6796e6086ddf79be387d5)
(cherry picked from commit 47cb8a41ffe7221814307ad72e58bdc735c1812c)

diff --git a/bin/lo-pack-sources b/bin/lo-pack-sources
index de6a4be..3571638 100755
--- a/bin/lo-pack-sources
+++ b/bin/lo-pack-sources
@@ -13,6 +13,7 @@ my %module_dirname = (
 "help"  => "helpcontent2",
 "translations"  => "translations"
 );
+my $lo_topdir_name;
 
 # get libreoffice-build version from the given libreoffice-build sources
 sub get_config_version($)
@@ -159,7 +160,7 @@ sub generate_tarball($$$)
 
 print "Creating $tarball...";
 # generate the tarball in the current directory; avoid "./" prefix in the 
stored paths; show progress
-system ("tar -c $tar_compress_option -f $tarball -C $dir --checkpoint=500 
--checkpoint-action=exec=\"echo -n .\" --transform=\"s|^\./||\" .") && 
+system ("tar -c $tar_compress_option -f $tarball -C $dir --checkpoint=500 
--checkpoint-action=exec=\"echo -n .\" $lo_topdir_name") && 
 die "Error: releasing failed: $!\n";
 print "\n";
 }
@@ -351,7 +352,6 @@ my $state_release_version;
 my $lo_core_tempdir;
 my $force;
 my $verbose=1;
-my $lo_topdir_name;
 my %module_tarball_name;
 
 ###
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Markus Mohrhard]

 chart2/qa/extras/xshape/data/reference/fdo75075.xml | 1032 
+-
 chart2/qa/extras/xshape/data/reference/property-mapping-bar.xml |  710 +++---
 chart2/source/view/main/ChartView.cxx   |   32 
 3 files changed, 873 insertions(+), 901 deletions(-)

New commits:
commit bd1fb229b4d4a221c225117460d60e8066bbfbbb
Author: Markus Mohrhard 
Date:   Wed Aug 6 20:28:18 2014 +0200

update the reference files

Change-Id: I063100a632286b7fbec71c5fba00b9705972ac9f

diff --git a/chart2/qa/extras/xshape/data/reference/fdo75075.xml 
b/chart2/qa/extras/xshape/data/reference/fdo75075.xml
index 3857248..9ffc66a 100644
--- a/chart2/qa/extras/xshape/data/reference/fdo75075.xml
+++ b/chart2/qa/extras/xshape/data/reference/fdo75075.xml
@@ -14,9 +14,9 @@

   
  
- 
+ 
   
-   
+   
 
 
 
@@ -25,12 +25,12 @@
 
 
 
- 
- 
+ 
+ 
  
 

-   
+   
 
 
 
@@ -39,18 +39,18 @@
 
 
 
- 
- 
+ 
+ 
  
 

-   
+   
 
- 
+ 
   
-   
+   
 
- 
+ 
   
   
   
@@ -59,216 +59,216 @@
   
   
   
-   
-   
+   
+   

   
  
 
 
- 
- 
+ 
+ 
  
 

-   
+   
 
- 
+ 
   
-   
+   
 
- 
+ 
   
   
   
   

-
-
+
+


-
-
+
+


-
-
+
+


-
-
+
+


-
-
+
+


-
-
+
+


-
-
+
+


-
-
+
+


-
-
+
+

   
   

-
-
+
+


-
-
+
+


-
-
+
+


-
-
+
+


-
-
+
+


-
-
+
+


-
-
+
+


-
-
+
+


-
+
 

   
   
-   
-   
+   
+   

   
  
- 
+ 
   
   
   
   

-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+

   
   

-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
 

   
   
-   
-   
+   
+   

   
  
 
 
- 
- 
+ 
+ 
  
 

   
   
-   
-   
+   
+   

   
  
- 
+ 
   
-   
+   
 
- 
+ 
   

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

[Kohei Yoshida]

 chart2/qa/extras/xshape/chart2xshape.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d99d1d2c4e8af92e333ef3912d401989239b49ed
Author: Kohei Yoshida 
Date:   Wed Aug 6 14:36:23 2014 -0400

Remove the 2nd argument which was added unintentionally.

Change-Id: I264dba74bf4cab4beb97b33d3a71e82601119372

diff --git a/chart2/qa/extras/xshape/chart2xshape.cxx 
b/chart2/qa/extras/xshape/chart2xshape.cxx
index 0099eef..143fe61 100644
--- a/chart2/qa/extras/xshape/chart2xshape.cxx
+++ b/chart2/qa/extras/xshape/chart2xshape.cxx
@@ -84,7 +84,7 @@ void Chart2XShapeTest::testFdo75075()
 void Chart2XShapeTest::testPropertyMappingBarChart()
 {
 load("chart2/qa/extras/xshape/data/ods/", "property-mapping-bar.ods");
-compareAgainstReference("property-mapping-bar.xml", true);
+compareAgainstReference("property-mapping-bar.xml");
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(Chart2XShapeTest);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 18 commits - chart2/opengl chart2/Package_opengl.mk chart2/source

[Markus Mohrhard]

 chart2/Package_opengl.mk|2 
 chart2/opengl/pickingFragmentShader.glsl|5 
 chart2/opengl/pickingVertexShader.glsl  |7 
 chart2/opengl/shape3DFragmentShaderBatchScroll.glsl |  111 
 chart2/opengl/shape3DFragmentShaderV300.glsl|7 
 chart2/opengl/shape3DVertexShader.glsl  |4 
 chart2/opengl/shape3DVertexShaderBatchScroll.glsl   |   39 
 chart2/opengl/shape3DVertexShaderV300.glsl  |8 
 chart2/source/view/charttypes/GL3DBarChart.cxx  |  123 -
 chart2/source/view/inc/GL3DBarChart.hxx |2 
 chart2/source/view/inc/GL3DRenderer.hxx |   36 +++
 chart2/source/view/main/GL3DRenderer.cxx|  183 +---
 12 files changed, 493 insertions(+), 34 deletions(-)

New commits:
commit ac6fabdc02fdcba8a502153099512946d2b7effd
Author: Markus Mohrhard 
Date:   Wed Aug 6 12:26:11 2014 +0200

fix Wreorder

Change-Id: Icc9d9587ddf5610d6adaca9b2ea5eb32e2534947

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 1eed3cb..b9af4266 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -180,8 +180,8 @@ public:
 RenderBenchMarkThread(GL3DBarChart * pChart):
 RenderThread(pChart),
 mbExecuting(false),
-miFrameCount(0),
-mbNeedFlyBack(false)
+mbNeedFlyBack(false),
+miFrameCount(0)
 {
 osl_getSystemTime(&mafpsRenderStartTime);
 osl_getSystemTime(&mafpsRenderEndTime);
diff --git a/chart2/source/view/inc/GL3DRenderer.hxx 
b/chart2/source/view/inc/GL3DRenderer.hxx
index c993ecd..f4b4b67 100644
--- a/chart2/source/view/inc/GL3DRenderer.hxx
+++ b/chart2/source/view/inc/GL3DRenderer.hxx
@@ -464,9 +464,9 @@ private:
 sal_uInt32 m_uiSelectID;
 float m_fScrollSpeed;
 float m_fScrollDistance;
-float m_fCurDistance;
 float m_fMinCoordX;
 float m_fMaxCoordX;
+float m_fCurDistance;
 glm::mat4 m_ScrollMoveMatrix;
 bool m_bUndrawFlag;
 };
diff --git a/chart2/source/view/main/GL3DRenderer.cxx 
b/chart2/source/view/main/GL3DRenderer.cxx
index 57f016b..48d7da7 100644
--- a/chart2/source/view/main/GL3DRenderer.cxx
+++ b/chart2/source/view/main/GL3DRenderer.cxx
@@ -114,8 +114,8 @@ OpenGL3DRenderer::OpenGL3DRenderer():
 , m_fMinCoordX(0.0f)
 , m_fMaxCoordX(0.0f)
 , m_fCurDistance(0.0f)
-, m_bUndrawFlag(false)
 , m_ScrollMoveMatrix(glm::mat4(1.0))
+, m_bUndrawFlag(false)
 {
 m_Polygon3DInfo.lineOnly = false;
 m_Polygon3DInfo.twoSidesLighting = false;
@@ -162,6 +162,7 @@ OpenGL3DRenderer::~OpenGL3DRenderer()
 
 OpenGL3DRenderer::ShaderResources::ShaderResources()
 : m_b330Support(false)
+, m_bScrollFlag(false)
 , m_3DProID(0)
 , m_3DProjectionID(0)
 , m_3DViewID(0)
@@ -207,7 +208,6 @@ OpenGL3DRenderer::ShaderResources::ShaderResources()
 , m_BatchTextVertexID(0)
 , m_BatchTextTexCoordID(0)
 , m_BatchTextTexID(0)
-, m_bScrollFlag(false)
 {
 }
 
commit 8f38b9e11eef43fbc47827eff432b3620aeee2d4
Author: weigao 
Date:   Thu Aug 7 14:25:50 2014 +0800

remove test code of screen text

Change-Id: Ibcda49dc561b2778d17c03edaaaf2b8e2fff4a0a

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index 186bbac..1eed3cb 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -377,16 +377,7 @@ void RenderBenchMarkThread::UpdateFPS()
 osl_getSystemTime(&mafpsRenderStartTime);
 }
 osl_getSystemTime(&mafpsRenderEndTime);
-#if 1
-opengl3D::ScreenText tFPS(mpChart->mpRenderer.get(), 
*(mpChart->mpTextCache), mpChart->mTestString, 0);
-opengl3D::TextCacheItem tmpTextCache = 
mpChart->mpTextCache->getText(mpChart->mTestString);
-#else
-opengl3D::ScreenText tFPS(mpChart->mpRenderer.get(), 
*(mpChart->mpTextCache), maFPS, 0);
-opengl3D::TextCacheItem tmpTextCache = 
mpChart->mpTextCache->getText(maFPS);
-#endif
-float rectWidth = (float)tmpTextCache.maSize.Width() / 
(float)tmpTextCache.maSize.Height() * 0.05;
-tFPS.setPosition(glm::vec2(-0.99f, 0.99f), glm::vec2(-0.99f + rectWidth, 
0.89f));
-tFPS.render();
+//will add the fps render code here later
 }
 
 void RenderBenchMarkThread::UpdateScreenText()
@@ -648,7 +639,6 @@ void GL3DBarChart::create3DShapes(const 
boost::ptr_vector& rDataSer
 
 maShapes.push_back(new opengl3D::Text(mpRenderer.get(), *mpTextCache,
 aCats[i], nId));
-mTestString = aCats[i];
 nId += ID_STEP;
 p = static_cast(&maShapes.back());
 aTopLeft.x = nXPos + TEXT_HEIGHT + 0.5 * BAR_SIZE_X;
diff --git a/chart2/source/view/inc/GL3DBarChart.hxx 
b/chart2/source/view/inc/GL3DBarChart.hxx
index a4a92a4..7b1e7b6 100644
--- a/chart2/source/view/inc/GL3DBarChart.hxx
+++ b/chart2

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

[Szymon Kłos]

 chart2/AllLangResTarget_chartcontroller.mk|1 
 chart2/source/controller/dialogs/tp_PointGeometry.src |   30 --
 2 files changed, 31 deletions(-)

New commits:
commit afbbc4cf4ceea9445cbb584b50d511c512e5133f
Author: Szymon Kłos 
Date:   Wed Aug 6 11:15:36 2014 +0200

deleted TP_LAYOUT resource

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

diff --git a/chart2/AllLangResTarget_chartcontroller.mk 
b/chart2/AllLangResTarget_chartcontroller.mk
index 764379e..acb7c69 100644
--- a/chart2/AllLangResTarget_chartcontroller.mk
+++ b/chart2/AllLangResTarget_chartcontroller.mk
@@ -36,7 +36,6 @@ $(eval $(call gb_SrsTarget_add_files,chart2/res,\
 
 $(eval $(call gb_SrsTarget_add_nonlocalizable_files,chart2/res,\
 chart2/source/controller/dialogs/Bitmaps.src \
-chart2/source/controller/dialogs/tp_PointGeometry.src \
 chart2/source/controller/menus/ShapeContextMenu.src \
 chart2/source/controller/menus/ShapeEditContextMenu.src \
 ))
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.src 
b/chart2/source/controller/dialogs/tp_PointGeometry.src
deleted file mode 100644
index be2dd28..000
--- a/chart2/source/controller/dialogs/tp_PointGeometry.src
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-#include "ResourceIds.hrc"
-#include "TabPages.hrc"
-
-TabPage TP_LAYOUT
-{
-HelpID = "chart2:TabPage:TP_LAYOUT";
-Hide = TRUE ;
-SVLook = TRUE ;
-Size   = MAP_APPFONT ( TP_WIDTH , TP_HEIGHT ) ;
-};
-
-/* 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: [RFC} running a formatter over the Java code

[Anthonys Lists]

On 06/08/2014 08:28, Stephan Bergmann wrote:

On 08/05/2014 10:26 AM, Noel Grandin wrote:

Would there be any objections to my running a formatter over the
existing Java LO code (with the exception of the newer Android stuff) ?

Because at the moment
- it has very little consistency
- and it appears that at some point in time a tabs-to-spaces conversion
was done, but not all the files followed the same tab-size convention,
so some of the formatting is now REALLY out.


With no mechanism in place to automatically enforce a specific 
formatting algorithm, code formatted according to that algorithm will 
over time start to deviate from it again, anyway.  Hence, for already 
well-formatted code, arguably the only effect of such a reformatting 
is to make it harder to trace through the git history.


Therefore, an alternative approach could be to do a mass reformatting 
only for code that would truly benefit from it, like code whose broken 
tabs/spaces indentation has made it become "REALLY out" by now. That 
would of course be a more laborious commit than a wholesale 
modification of all *.java files.




Okay (and I understand why people don't want the system messing about 
with commits), but would it make sense or even be possible (if a 
formatting cleanup is done) to put a server-side hook that says "this 
formatting is non-standard, are you sure?". And maybe only for places 
that have been cleaned up ...



Or maybe I'm exaggerating the negative impact on browsing the git 
history, but that is at least what I feel after many a uses of git blame.


Or another possibility - have client-side hooks available so that those 
developers *who* *choose* *to* can have the code formatted their 
favourite way on checkout, and then converted back to standard on 
commit. In other words it's opt-in rather than automatic (which seems to 
be what has panicked most people).


Oh - and while it's a trivial issue, it's exactly the same thing - most 
git repositories DO reformat text on checkin/checkout. it's that (cr)lf 
thing, which if you don't do it will break a repository that has both 
Windows and DOS committers. Although that's not an argument in favour of 
a far more intrusive reformat ... :-)


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

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

[Michael Stahl]

 chart2/source/view/charttypes/GL3DBarChart.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 1c16a1e6141b9ec96022570cf4ba13ea7a7dacc3
Author: Michael Stahl 
Date:   Thu Aug 7 00:12:31 2014 +0200

chart2: -Werror,-Wunused-private-field

Change-Id: I4e67e11772f400f1e6ae1ba8af00dea81c085691

diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx 
b/chart2/source/view/charttypes/GL3DBarChart.cxx
index b9af4266..2baecf7 100644
--- a/chart2/source/view/charttypes/GL3DBarChart.cxx
+++ b/chart2/source/view/charttypes/GL3DBarChart.cxx
@@ -206,7 +206,6 @@ private:
 private:
 glm::vec3 maStartPos;
 glm::vec3 maEndPos;
-sal_Int32 mnSteps;
 bool mbExecuting;
 bool mbNeedFlyBack;
 glm::vec3 maStep;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 chart2/source/view/axes/VCartesianAxis.cxx |  225 ++---
 1 file changed, 113 insertions(+), 112 deletions(-)

New commits:
commit e942fbfad420cf9e6e4ba7358380e1fec3d13952
Author: Kohei Yoshida 
Date:   Wed Aug 6 20:59:34 2014 -0400

Scope reduction.

Change-Id: Ie92743a05c857f0cbb5e812d8341127d29d18202

diff --git a/chart2/source/view/axes/VCartesianAxis.cxx 
b/chart2/source/view/axes/VCartesianAxis.cxx
index 4b59e3a..ca6ab68 100644
--- a/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/chart2/source/view/axes/VCartesianAxis.cxx
@@ -1381,50 +1381,50 @@ void VCartesianAxis::createLabels()
 return;
 
 //create labels
-if( m_aAxisProperties.m_bDisplayLabels )
-{
-boost::scoped_ptr< TickFactory_2D > apTickFactory2D( 
this->createTickFactory2D() );
-TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
-if( !pTickFactory2D )
-return;
+if (!m_aAxisProperties.m_bDisplayLabels)
+return;
 
-//get the transformed screen values for all tickmarks in aAllTickInfos
-pTickFactory2D->updateScreenValues( m_aAllTickInfos );
-//'hide' tickmarks with identical screen values in aAllTickInfos
-hideIdenticalScreenValues( m_aAllTickInfos );
+boost::scoped_ptr< TickFactory_2D > apTickFactory2D( 
this->createTickFactory2D() );
+TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
+if( !pTickFactory2D )
+return;
 
-removeTextShapesFromTicks();
+//get the transformed screen values for all tickmarks in aAllTickInfos
+pTickFactory2D->updateScreenValues( m_aAllTickInfos );
+//'hide' tickmarks with identical screen values in aAllTickInfos
+hideIdenticalScreenValues( m_aAllTickInfos );
 
-//create tick mark text shapes
-sal_Int32 nTextLevelCount = getTextLevelCount();
-sal_Int32 nScreenDistanceBetweenTicks = -1;
-for( sal_Int32 nTextLevel=0; nTextLevel apTickIter(createLabelTickIterator( 
nTextLevel ));
+if(apTickIter)
 {
-boost::scoped_ptr< TickIter > apTickIter(createLabelTickIterator( 
nTextLevel ));
-if(apTickIter)
+if(nTextLevel==0)
 {
-if(nTextLevel==0)
-{
-nScreenDistanceBetweenTicks = 
TickFactory_2D::getTickScreenDistance( *apTickIter.get() );
-if( nTextLevelCount>1 )
-nScreenDistanceBetweenTicks*=2; //the above used tick 
iter does contain also the sub ticks -> thus the given distance is only the half
-}
+nScreenDistanceBetweenTicks = 
TickFactory_2D::getTickScreenDistance( *apTickIter.get() );
+if( nTextLevelCount>1 )
+nScreenDistanceBetweenTicks*=2; //the above used tick iter 
does contain also the sub ticks -> thus the given distance is only the half
+}
 
-AxisLabelProperties aComplexProps(m_aAxisLabelProperties);
-if( m_aAxisProperties.m_bComplexCategories )
-{
-aComplexProps.bLineBreakAllowed = true;
-aComplexProps.bOverlapAllowed = !::rtl::math::approxEqual( 
aComplexProps.fRotationAngleDegree, 0.0 );
+AxisLabelProperties aComplexProps(m_aAxisLabelProperties);
+if( m_aAxisProperties.m_bComplexCategories )
+{
+aComplexProps.bLineBreakAllowed = true;
+aComplexProps.bOverlapAllowed = !::rtl::math::approxEqual( 
aComplexProps.fRotationAngleDegree, 0.0 );
 
-}
-AxisLabelProperties& rAxisLabelProperties =  
m_aAxisProperties.m_bComplexCategories ? aComplexProps : m_aAxisLabelProperties;
-while( !createTextShapes( m_xTextTarget, *apTickIter.get(), 
rAxisLabelProperties, pTickFactory2D, nScreenDistanceBetweenTicks ) )
-{
-};
 }
+AxisLabelProperties& rAxisLabelProperties =  
m_aAxisProperties.m_bComplexCategories ? aComplexProps : m_aAxisLabelProperties;
+while( !createTextShapes( m_xTextTarget, *apTickIter.get(), 
rAxisLabelProperties, pTickFactory2D, nScreenDistanceBetweenTicks ) )
+{
+};
 }
-doStaggeringOfLabels( m_aAxisLabelProperties, pTickFactory2D );
 }
+doStaggeringOfLabels( m_aAxisLabelProperties, pTickFactory2D );
 }
 
 void VCartesianAxis::createMaximumLabels()
@@ -1435,108 +1435,109 @@ void VCartesianAxis::createMaximumLabels()
 return;
 
 //create labels
-if( m_aAxisProperties.m_bDisplayLabels )
+if (!m_aAxisProperties.m_bDisplayLabels)
+return;
+
+boost::scoped_ptr< TickFactory_2D > apTickFactory2D( 
this->createTickFactory2D() );
+TickFactory_2D* pTickFactory2D = apTickFactory2D.get();
+if( !pTickFactory2D )
+return;
+
+//get the transformed screen values for all tickmarks in aAllTickInfos
+pTickFac

LibreOffice Gerrit News for core on 2014-08-07

[gerrit]

Moin!

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

 First time contributors doing great things! 
+ Convert PAGE_LDAP to .ui
  in https://gerrit.libreoffice.org/10799 from Mihály Palenik
  about module dbaccess
+ Convert PAGE_ADO and PAGE_MYSQL_ODBC to .ui
  in https://gerrit.libreoffice.org/10798 from Mihály Palenik
  about module dbaccess
+ Remove redundant inclusions of header "cppuhelper/shlib.h"
  in https://gerrit.libreoffice.org/10797 from Matthew Pottage
  about module cli_ure, cppuhelper
+ [API CHANGE] Removed two cppuhelper deprecated headers.
  in https://gerrit.libreoffice.org/10783 from Matthew Pottage
  about module cli_ure, cppuhelper, filter, include, odk
+ fdo#70625 Add --cat parameter to make git diffs pretty
  in https://gerrit.libreoffice.org/10623 from Deena P. F.
  about module desktop
+ fix external/coinmp on OSX: bad symlinking
  in https://gerrit.libreoffice.org/10614 from Douglas Mencken
  about module external
+ vcl/source/opengl/OpenGLContext.cxx: fix build for OSX < 10.6
  in https://gerrit.libreoffice.org/10592 from Douglas Mencken
  about module vcl
+ OSX: drop -malign-natural flag for non-clang compilers
  in https://gerrit.libreoffice.org/10479 from Douglas Mencken
  about module solenv
+ l10ntools: fixes and improvements for transex3 executable
  in https://gerrit.libreoffice.org/10212 from Douglas Mencken
  about module l10ntools
+ fdo#81426 : Data from header and footer is getting lost.
  in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji
  about module sw
 End of freshness 

+ XStyleLoader2 loadStylesFromDocument - unit tests
  in https://gerrit.libreoffice.org/10755 from Laurent Godard
  about module include, sc, test


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

+ deleted TP_LAYOUT resource
  in https://gerrit.libreoffice.org/10784 from Szymon Kłos
+ RID_SCDLG_CONFLICTS conversion to .ui
  in https://gerrit.libreoffice.org/10778 from Szymon Kłos
+ DLG_MAILMERGE conversion to .ui
  in https://gerrit.libreoffice.org/10753 from Szymon Kłos
+ fdo#82151 when constructing column object, replace m_aCurrentRow by a fun
  in https://gerrit.libreoffice.org/10792 from Lionel Elie Mamane
+ Don't leak the previous cache
  in https://gerrit.libreoffice.org/10793 from Lionel Elie Mamane
+ TAB_WIZ_TYPE_SELECT and TAB_WIZ_NAME_MATCHING conversion to .ui
  in https://gerrit.libreoffice.org/10776 from Szymon Kłos
+ Convert PAGE_ODBC to .ui
  in https://gerrit.libreoffice.org/10787 from Mihály Palenik
+ Kill XSUN Xinerama support
  in https://gerrit.libreoffice.org/10756 from Riccardo Magliocchetti
+ Convert PAGE_MYSQL_JDBC and PAGE_ORACLE_JDBC to .ui
  in https://gerrit.libreoffice.org/10785 from Mihály Palenik
+ Related fdo#69006: Reintroduce some height calculation back.
  in https://gerrit.libreoffice.org/10499 from Jan Holesovsky
+ Convert PAGE_DBASE to .ui
  in https://gerrit.libreoffice.org/10777 from Mihály Palenik


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

None

* Open changes needing tweaks, but being untouched for more than a week:

+ Rel fdo#48068: fix errors when 2 decimals in svg path position
  in https://gerrit.libreoffice.org/10544 from Joren De Cuyper
+ fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT
  in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami
+ VS2013: Make 64 bit shell extensions optional
  in https://gerrit.libreoffice.org/10163 from David Ostrovsky
+ fdo#57950 Replace chained append( with operator+)
  in https://gerrit.libreoffice.org/10149 from Petr Vorel
+ fdo#79018: LO hangs while opening file.
  in https://gerrit.libreoffice.org/9564 from Yogesh Bharate
+ Use assert instead of OSL_ASSERT in sal/
  in https://gerrit.libreoffice.org/10113 from Arnaud Versini
+ move OpenGLContext to SAL
  in https://gerrit.libreoffice.org/9429 from David Tardon
+ Changes for Wordml
  in https://gerrit.libreoffice.org/9013 from Michel Messak
+ fdo#64945 Remove inconvenient localized symbol code.
  in https://gerrit.libreoffice.org/8696 from Darshana Padmadas
+ fdo#77716 : Paragraph spacing is not preserved after RT.
  in https://gerrit.libreoffice.org/9197 from Tushar Bende
+ fdo#77121 Header / Footer positions not preserved after RT
  in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad


Best,

Your friendly LibreOffice Gerrit Digest Mailer

Note: The bot generating this message can be found and improved here:
   
https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: configure.ac Makefile.in oox/source README.cross

[Tor Lillqvist]

 Makefile.in  |   14 --
 README.cross |4 ++--
 configure.ac |4 ++--
 oox/source/drawingml/customshapes/README |6 +++---
 4 files changed, 7 insertions(+), 21 deletions(-)

New commits:
commit 0acc3300f14e7f961bc165f58e97d1f35164d781
Author: Tor Lillqvist 
Date:   Thu Aug 7 09:04:45 2014 +0300

If dev-install is obsolete, why have it at all?

Replace mentions of it in a few (dcumentation) places with test-install.

Change-Id: I6fc8e58fa5813b05de16feec35215c83e0e45834

diff --git a/Makefile.in b/Makefile.in
index 028c55c..0c9893c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -277,20 +277,6 @@ install-strip:
@$(call gb_Top_InstallFinished,Installation,$(INSTALLDIR))
 endif # !MACOSX
 
-dev-install:
-   @echo && echo "dev-install is obsolete! Just build with \"make check\" 
and run"
-ifeq ($(OS),MACOSX)
-   @echo "  open instdir/$(PRODUCTNAME).app"
-   @echo
-   @echo "To debug: gdb instdir/$(PRODUCTNAME).app/Contents/MacOS/soffice"
-else
-   @echo "  instdir/program/soffice"
-endif
-   @echo
-   @echo "(only if you have good reason to test an actual installation: 
make test-install)"
-   @echo
-   @false
-
 test-install: build
@rm -rf $(TESTINSTALLDIR)
@mkdir -p $(TESTINSTALLDIR)
diff --git a/README.cross b/README.cross
index cfeaadc..5ad963f 100644
--- a/README.cross
+++ b/README.cross
@@ -220,9 +220,9 @@ TODO:
 others; would be best to avoid that if at all possible (using a free
 cab implementation, part of Wine or something)
   - MSI generation
-  - if at all possible, the make dev-install installation (with links
+  - if at all possible, the make test-install installation (with links
 back to the build) should be done so that it would be directly
-executable via wine after doing make dev-install :-)
+executable via wine after doing make test-install :-)
 
 - runtime
   - no idea if the entire thing works after the installation at all; I
diff --git a/configure.ac b/configure.ac
index 3aadd12..17c8d3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9868,7 +9868,7 @@ if test "$_os" = "WINNT" -a "$cross_compiling" != "yes"; 
then
 if test "$WITH_MINGW" = "yes"; then
 AC_PATH_PROG([UUIDGEN], [uuid])
 if test -z "$UUIDGEN"; then
-AC_MSG_WARN([uuid is needed for dev-install])
+AC_MSG_WARN([uuid is needed for test-install])
 fi
 else
 # presence is already tested above in the WINDOWS_SDK_HOME check
@@ -9878,7 +9878,7 @@ if test "$_os" = "WINNT" -a "$cross_compiling" != "yes"; 
then
 else
 AC_PATH_PROG([UUIDGEN], [uuidgen])
 if test -z "$UUIDGEN"; then
-AC_MSG_WARN([uuid is needed for dev-install])
+AC_MSG_WARN([uuid is needed for test-install])
 fi
 fi
 
diff --git a/oox/source/drawingml/customshapes/README 
b/oox/source/drawingml/customshapes/README
index 0b3ef8f..e537c24 100755
--- a/oox/source/drawingml/customshapes/README
+++ b/oox/source/drawingml/customshapes/README
@@ -10,9 +10,9 @@
 
 set -o errexit
 
-# To re-generate the code, you need to be on Linux (I think). You need
-# to have done a make dev-install. oox needs to be build with
-# dbglevel=2 so that DEBUG is defined.
+# To re-generate the code, you need to be on Linux (I think). You
+# might need to have done a make test-install. oox needs to be build
+# with dbglevel=2 so that DEBUG is defined.
 
 make oox.clean && make oox dbglevel=2
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 vcl/unx/gtk/gdi/salprn-gtk.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 1d7751dd7d055c13324ff714523905e95e44fd4c
Author: Stephan Bergmann 
Date:   Thu Aug 7 08:55:56 2014 +0200

including gtk/gtkunixprint.h appears unnecessary

...and at least gtk2-devel-2.10.4-30.el5, while new enough to cause
ENABLE_GTK_PRINT=TRUE, does not contain
/usr/include/gtk-unix-print-2.0/gtk/gtkunixprint.h

Change-Id: I6ff98e0c67047c0d8c35cfcad45be47ff09ca97a

diff --git a/vcl/unx/gtk/gdi/salprn-gtk.cxx b/vcl/unx/gtk/gdi/salprn-gtk.cxx
index 0251ffd..2056a13 100644
--- a/vcl/unx/gtk/gdi/salprn-gtk.cxx
+++ b/vcl/unx/gtk/gdi/salprn-gtk.cxx
@@ -21,7 +21,6 @@
 #include "vcl/window.hxx"
 
 #include 
-#include 
 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits