date:20130606

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

2013-06-06 Thread Miklos Vajna

 sw/qa/extras/ww8import/data/page-border.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx|   11 +++
 sw/source/filter/ww8/ww8par.cxx |6 +++---
 3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit f06cc552a0699f7c2c34db981e77d4c8efe5e9e7
Author: Miklos Vajna 
Date:   Wed Jun 5 17:49:13 2013 +0200

wwSectionManager: fix import of page borders

Regression from 1e113cb7604e1509e7d598a9be329f1f7b6e9322. According to
the spec (see 2.9.181), the first bit disables border of "all but first"
pages, the second bit disables the border of first pages.

Change-Id: Ie49c9b7b76d34c2a93350481965790976f49d7df

diff --git a/sw/qa/extras/ww8import/data/page-border.doc 
b/sw/qa/extras/ww8import/data/page-border.doc
new file mode 100755
index 000..c2dec4f
Binary files /dev/null and b/sw/qa/extras/ww8import/data/page-border.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index d924ef3..0ded9f7 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -18,6 +18,8 @@
 #include 
 #include 
 
+#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : 
(((TWIP)*127L-36L)/72L))
+
 class Test : public SwModelTestBase
 {
 public:
@@ -32,6 +34,7 @@ public:
 void testI120158();
 void testN816603();
 void testN816593();
+void testPageBorder();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -57,6 +60,7 @@ void Test::run()
 {"i120158.doc", &Test::testI120158},
 {"n816603.doc", &Test::testN816603},
 {"n816593.doc", &Test::testN816593},
+{"page-border.doc", &Test::testPageBorder},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -271,6 +275,13 @@ void Test::testN816593()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
 }
 
+void Test::testPageBorder()
+{
+// Page border was missing (LineWidth was 0), due to wrong interpretation 
of pgbApplyTo.
+table::BorderLine2 aBorder = 
getProperty(getStyles("PageStyles")->getByName(DEFAULT_STYLE),
 "TopBorder");
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(TWIP_TO_MM100(6 * 20)), aBorder.LineWidth);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 598385a..907454f 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3848,10 +3848,10 @@ void wwSectionManager::SetSegmentToPageDesc(const 
wwSection &rSection,
 
 SetPage(rPage, rFmt, rSection, bIgnoreCols);
 
-if (rSection.maSep.pgbApplyTo & 1)
-mrReader.SetPageBorder(rPage.GetFirst(), rSection);
-if (rSection.maSep.pgbApplyTo & 2)
+if (!(rSection.maSep.pgbApplyTo & 1))
 mrReader.SetPageBorder(rFmt, rSection);
+if (!(rSection.maSep.pgbApplyTo & 2))
+mrReader.SetPageBorder(rPage.GetFirst(), rSection);
 
 mrReader.SetDocumentGrid(rFmt, rSection);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Buggy configure checks in the 4.1 branch

2013-06-06 Thread Tor Lillqvist

Try cherry-picking 592e23ab123acfb18c0988f107528744727337d8 ?

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

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

2013-06-06 Thread Adam Co

 sw/source/filter/ww8/docxattributeoutput.cxx |   68 ++-
 sw/source/filter/ww8/docxattributeoutput.hxx |   21 
 2 files changed, 77 insertions(+), 12 deletions(-)

New commits:
commit 408d060dff4737d5468e7ff04035f1674a923198
Author: Adam Co 
Date:   Wed Jun 5 18:42:10 2013 +0300

fdo#64350: fix for DOCX export of border space

Change-Id: Ibd333aa4f85ed04c531187eb89b879196dca2bd8
Reviewed-on: https://gerrit.libreoffice.org/4167
Reviewed-by: Miklos Vajna 
Tested-by: Miklos Vajna 

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index a062499..5cbf3c6 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1506,7 +1506,46 @@ static void impl_borderLine( FSHelperPtr pSerializer, 
sal_Int32 elementToken, co
 pSerializer->singleElementNS( XML_w, elementToken, xAttrs );
 }
 
-static void impl_pageBorders( FSHelperPtr pSerializer, const SvxBoxItem& rBox, 
sal_Int32 tag, bool bUseStartEnd = false, bool bWriteTag = true, const 
SvxBoxItem* pDefaultBorders = 0)
+static OutputBorderOptions lcl_getTableDefaultBorderOptions(bool bEcma)
+{
+OutputBorderOptions rOptions;
+
+rOptions.tag = XML_tblBorders;
+rOptions.bUseStartEnd = !bEcma;
+rOptions.bWriteTag = true;
+rOptions.bWriteInsideHV = true;
+rOptions.bWriteDistance = false;
+
+return rOptions;
+}
+
+static OutputBorderOptions lcl_getTableCellBorderOptions(bool bEcma)
+{
+OutputBorderOptions rOptions;
+
+rOptions.tag = XML_tcBorders;
+rOptions.bUseStartEnd = !bEcma;
+rOptions.bWriteTag = true;
+rOptions.bWriteInsideHV = true;
+rOptions.bWriteDistance = false;
+
+return rOptions;
+}
+
+static OutputBorderOptions lcl_getBoxBorderOptions()
+{
+OutputBorderOptions rOptions;
+
+rOptions.tag = XML_pBdr;
+rOptions.bUseStartEnd = false;
+rOptions.bWriteTag = false;
+rOptions.bWriteInsideHV = false;
+rOptions.bWriteDistance = true;
+
+return rOptions;
+}
+
+static void impl_borders( FSHelperPtr pSerializer, const SvxBoxItem& rBox, 
const OutputBorderOptions& rOptions)
 {
 static const sal_uInt16 aBorders[] =
 {
@@ -1516,9 +1555,9 @@ static void impl_pageBorders( FSHelperPtr pSerializer, 
const SvxBoxItem& rBox, s
 const sal_Int32 aXmlElements[] =
 {
 XML_top,
-bUseStartEnd ? XML_start : XML_left,
+rOptions.bUseStartEnd ? XML_start : XML_left,
 XML_bottom,
-bUseStartEnd ? XML_end : XML_right
+rOptions.bUseStartEnd ? XML_end : XML_right
 };
 bool tagWritten = false;
 const sal_uInt16* pBrd = aBorders;
@@ -1526,23 +1565,28 @@ static void impl_pageBorders( FSHelperPtr pSerializer, 
const SvxBoxItem& rBox, s
 {
 const SvxBorderLine* pLn = rBox.GetLine( *pBrd );
 
-if (!tagWritten && bWriteTag) {
-pSerializer->startElementNS( XML_w, tag, FSEND );
+if (!tagWritten && rOptions.bWriteTag) {
+pSerializer->startElementNS( XML_w, rOptions.tag, FSEND );
 tagWritten = true;
 }
 
-impl_borderLine( pSerializer, aXmlElements[i], pLn, 0 );
+sal_uInt16 nDist = 0;
+if (rOptions.bWriteDistance)
+{
+nDist = rBox.GetDistance( *pBrd );
+}
+impl_borderLine( pSerializer, aXmlElements[i], pLn, nDist );
 
 // When exporting default borders, we need to export these 2 attr
-if ( pDefaultBorders == 0 ) {
+if ( rOptions.bWriteInsideHV) {
 if ( i == 2 )
 impl_borderLine( pSerializer, XML_insideH, pLn, 0 );
 else if ( i == 3 )
 impl_borderLine( pSerializer, XML_insideV, pLn, 0 );
 }
 }
-if (tagWritten && bWriteTag) {
-pSerializer->endElementNS( XML_w, tag );
+if (tagWritten && rOptions.bWriteTag) {
+pSerializer->endElementNS( XML_w, rOptions.tag );
 }
 }
 
@@ -1643,7 +1687,7 @@ void DocxAttributeOutput::TableCellProperties( 
ww8::WW8TableNodeInfoInner::Point
 const SvxBoxItem& rDefaultBox = (*tableFirstCells.rbegin())->getTableBox( 
)->GetFrmFmt( )->GetBox( );
 {
 // The cell borders
-impl_pageBorders( m_pSerializer, rBox, XML_tcBorders, !bEcma, true, 
&rDefaultBox );
+impl_borders( m_pSerializer, rBox, 
lcl_getTableCellBorderOptions(bEcma) );
 }
 
 TableBackgrounds( pTableTextNodeInfoInner );
@@ -1893,7 +1937,7 @@ void DocxAttributeOutput::TableDefaultBorders( 
ww8::WW8TableNodeInfoInner::Point
 bool bEcma = GetExport().GetFilter().getVersion( ) == 
oox::core::ECMA_DIALECT;
 
 // the defaults of the table are taken from the top-left cell
-impl_pageBorders( m_pSerializer, pFrmFmt->GetBox( ), XML_tblBorders, 
!bEcma, true );
+impl_borders( m_pSerializer, pFrmFmt->GetBox( ), 
lcl_getTableDefaultBorderOptions(bEcma) );
 }
 
 void DocxAttributeOutput::TableDefaultCellMargins( 
ww8::

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

2013-06-06 Thread Miklos Vajna

 sw/qa/extras/ww8import/data/page-border.doc |binary
 sw/qa/extras/ww8import/ww8import.cxx|   11 +++
 sw/source/filter/ww8/ww8par.cxx |6 +++---
 3 files changed, 14 insertions(+), 3 deletions(-)

New commits:
commit a4f5152c8a0438c38cfbcb5738a128497da59a17
Author: Miklos Vajna 
Date:   Wed Jun 5 17:49:13 2013 +0200

wwSectionManager: fix import of page borders

Regression from 1e113cb7604e1509e7d598a9be329f1f7b6e9322. According to
the spec (see 2.9.181), the first bit disables border of "all but first"
pages, the second bit disables the border of first pages.

Change-Id: Ie49c9b7b76d34c2a93350481965790976f49d7df
(cherry picked from commit f06cc552a0699f7c2c34db981e77d4c8efe5e9e7)

diff --git a/sw/qa/extras/ww8import/data/page-border.doc 
b/sw/qa/extras/ww8import/data/page-border.doc
new file mode 100755
index 000..c2dec4f
Binary files /dev/null and b/sw/qa/extras/ww8import/data/page-border.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index d924ef3..0ded9f7 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -18,6 +18,8 @@
 #include 
 #include 
 
+#define TWIP_TO_MM100(TWIP) ((TWIP) >= 0 ? (((TWIP)*127L+36L)/72L) : 
(((TWIP)*127L-36L)/72L))
+
 class Test : public SwModelTestBase
 {
 public:
@@ -32,6 +34,7 @@ public:
 void testI120158();
 void testN816603();
 void testN816593();
+void testPageBorder();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -57,6 +60,7 @@ void Test::run()
 {"i120158.doc", &Test::testI120158},
 {"n816603.doc", &Test::testN816603},
 {"n816593.doc", &Test::testN816593},
+{"page-border.doc", &Test::testPageBorder},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -271,6 +275,13 @@ void Test::testN816593()
 CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount());
 }
 
+void Test::testPageBorder()
+{
+// Page border was missing (LineWidth was 0), due to wrong interpretation 
of pgbApplyTo.
+table::BorderLine2 aBorder = 
getProperty(getStyles("PageStyles")->getByName(DEFAULT_STYLE),
 "TopBorder");
+CPPUNIT_ASSERT_EQUAL(sal_uInt32(TWIP_TO_MM100(6 * 20)), aBorder.LineWidth);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 598385a..907454f 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -3848,10 +3848,10 @@ void wwSectionManager::SetSegmentToPageDesc(const 
wwSection &rSection,
 
 SetPage(rPage, rFmt, rSection, bIgnoreCols);
 
-if (rSection.maSep.pgbApplyTo & 1)
-mrReader.SetPageBorder(rPage.GetFirst(), rSection);
-if (rSection.maSep.pgbApplyTo & 2)
+if (!(rSection.maSep.pgbApplyTo & 1))
 mrReader.SetPageBorder(rFmt, rSection);
+if (!(rSection.maSep.pgbApplyTo & 2))
+mrReader.SetPageBorder(rPage.GetFirst(), rSection);
 
 mrReader.SetDocumentGrid(rFmt, rSection);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Mark Wielaard

 vcl/source/filter/jpeg/Exif.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9645818f6817652568fe14c83c2dc46a9e5c3489
Author: Mark Wielaard 
Date:   Thu Jun 6 09:36:09 2013 +0200

Fix memory leak in Exif::processExif. Delete aExifData when done.

Change-Id: I1e63727fb8d587401c72775a14e7e3572b04fff5
Reviewed-on: https://gerrit.libreoffice.org/4171
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 167cf54..f44b54f 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -213,6 +213,7 @@ bool Exif::processExif(SvStream& rStream, sal_uInt16 
aSectionLength, bool bSetVa
 
 if( 0x4949 != aTiffHeader->byteOrder || 0x002A != aTiffHeader->tagAlign )
 {
+delete[] aExifData;
 return false;
 }
 
@@ -231,6 +232,7 @@ bool Exif::processExif(SvStream& rStream, sal_uInt16 
aSectionLength, bool bSetVa
 rStream.Write(aExifData, aLength);
 }
 
+delete[] aExifData;
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 69/1aff9ca443dbd8ad907b32b96c031dd9ffa829

2013-06-06 Thread Caolán McNamara

 69/1aff9ca443dbd8ad907b32b96c031dd9ffa829 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d713971d19b9d3e1e63751c0cb854db0ff01c9f9
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 09:20:54 2013 +0100

Notes added by 'git notes add'

diff --git a/69/1aff9ca443dbd8ad907b32b96c031dd9ffa829 
b/69/1aff9ca443dbd8ad907b32b96c031dd9ffa829
new file mode 100644
index 000..d31bfec
--- /dev/null
+++ b/69/1aff9ca443dbd8ad907b32b96c031dd9ffa829
@@ -0,0 +1 @@
+merged as: e9ac56d4d96d26de9d63d512ba1bd650939bbf60
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Zhe Wang

 sd/source/filter/eppt/epptso.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit e9ac56d4d96d26de9d63d512ba1bd650939bbf60
Author: Zhe Wang 
Date:   Fri Sep 7 03:52:32 2012 +

Resolves: #i120768# slide content merged Master viewer content

* subversion/main/sd/source/filter/eppt/epptso.cxx

[]should drop the redundant presentation placeholder textbox when import to 
ppt

Patch by: Ma Bingbing 
Suggested by: Wang Zhe 
Found by: Yan Ji 
Review by: Wang Zhe 

(cherry picked from commit 691aff9ca443dbd8ad907b32b96c031dd9ffa829)

Change-Id: I1a1de0152feaacb449f2e2bad444d1bff9e7c4cb

diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index edb4afa..30ce35d 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -3063,6 +3063,13 @@ void PPTWriter::ImplWritePage( const PHLayout& rLayout, 
EscherSolverContainer& a
 }
 if ( !mbPresObj )
 {
+if (ePageType == MASTER )
+{
+SdrObject* pObj = GetSdrObjectFromXShape( mXShape );
+if (pObj && pObj->IsNotVisibleAsMaster())
+continue;
+}
+
 mType = "drawing.Text";
 ImplCreateTextShape( aPropOpt, aSolverContainer, sal_True 
);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Michael Stahl

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

New commits:
commit fe86346c4900914da1e0ebf87f97a0044640490e
Author: Michael Stahl 
Date:   Tue Jun 4 23:32:09 2013 +0200

fdo#61923: sw: word completion: do not add trailing '.'

SwAutoCompleteWord::InsertWord(): use the computed nWrdLen to cut off
trailing periods.

(regression from d602a3b280fcc1cf16660d8719cd8eb8797dd2ad)

Change-Id: I9f4ace62f8d9e7d233e7e210f476856d7841d869
(cherry picked from commit 246d7e280ea8b7d1e27e14a6568d2a65cc8c9e7b)
Reviewed-on: https://gerrit.libreoffice.org/4159
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index 3588290..d59d84f 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -265,7 +265,7 @@ bool SwAutoCompleteWord::InsertWord( const String& rWord, 
SwDoc& rDoc )
 std::pair
 aInsPair = m_WordList.insert(pNew);
 
-m_LookupTree->insert( OUString(aNewWord) );
+m_LookupTree->insert( OUString(aNewWord).copy(0, nWrdLen) );
 
 if (aInsPair.second)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Buggy configure checks in the 4.1 branch

2013-06-06 Thread Tor Lillqvist

>
>
> This issue is in no way specific to MACOSX and the patch should be applied
> unconditionally.


But the fix is not portable, GNU tail has no -r option.

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

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

2013-06-06 Thread Michael Stahl

 xmlhelp/source/treeview/tvread.cxx |   86 -
 1 file changed, 10 insertions(+), 76 deletions(-)

New commits:
commit 52e0ff83639809b8f2e92a9899ed5ed795f3d780
Author: Michael Stahl 
Date:   Wed Jun 5 21:33:03 2013 +0200

stop this decadent waste of precious newlines

Change-Id: I803d7d56ba7350fd0f5b2c4efa392d55a0fd4542

diff --git a/xmlhelp/source/treeview/tvread.cxx 
b/xmlhelp/source/treeview/tvread.cxx
index d96d4a5..0669911 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -40,7 +40,6 @@
 
 namespace treeview {
 
-
 class TVDom
 {
 friend class TVChildTarget;
@@ -61,7 +60,6 @@ namespace treeview {
 delete children[i];
 }
 
-
 TVDom* newChild()
 {
 children.push_back( new TVDom( this ) );
@@ -75,7 +73,6 @@ namespace treeview {
 return children.back();
 }
 
-
 TVDom* getParent() const
 {
 if( parent )
@@ -95,7 +92,6 @@ namespace treeview {
 void setKind( Kind ind ) { kind = ind; }
 Kind getKind( ) const { return kind; }
 
-
 void setApplication( const char* appl )
 {
 application = OUString( (sal_Char*)(appl),
@@ -170,7 +166,6 @@ namespace treeview {
 }
 
 
-
 using namespace treeview;
 using namespace com::sun::star;
 using namespace com::sun::star::uno;
@@ -236,8 +231,6 @@ void SAL_CALL ConfigData::replaceName( OUString& oustring ) 
const
 }
 
 
-
-
 //
 // XInterface
 //
@@ -251,7 +244,6 @@ TVBase::acquire(
   OWeakObject::acquire();
 }
 
-
 void SAL_CALL
 TVBase::release(
   void )
@@ -260,7 +252,6 @@ TVBase::release(
   OWeakObject::release();
 }
 
-
 Any SAL_CALL
 TVBase::queryInterface(
 const Type& rType )
@@ -276,7 +267,6 @@ TVBase::queryInterface(
 return aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType );
 }
 
-
 

 //
 // XTypeProvider methods.
@@ -288,14 +278,8 @@ XTYPEPROVIDER_IMPL_5( TVBase,
   XChangesNotifier,
   XComponent );
 
-
-
-
-
-
 // TVRead
 
-
 TVRead::TVRead( const ConfigData& configData,TVDom* tvDom )
 {
 if( ! tvDom )
@@ -314,17 +298,10 @@ TVRead::TVRead( const ConfigData& configData,TVDom* tvDom 
)
 Children = new TVChildTarget( configData,tvDom );
 }
 
-
-
 TVRead::~TVRead()
 {
 }
 
-
-
-
-
-
 // XNameAccess
 
 Any SAL_CALL
@@ -353,9 +330,6 @@ TVRead::getByName( const OUString& aName )
 throw NoSuchElementException();
 }
 
-
-
-
 Sequence< OUString > SAL_CALL
 TVRead::getElementNames( )
 throw( RuntimeException )
@@ -369,8 +343,6 @@ TVRead::getElementNames( )
 return seq;
 }
 
-
-
 sal_Bool SAL_CALL
 TVRead::hasByName( const OUString& aName )
 throw( RuntimeException )
@@ -383,7 +355,6 @@ TVRead::hasByName( const OUString& aName )
 return false;
 }
 
-
 // XHierarchicalNameAccess
 
 Any SAL_CALL
@@ -401,9 +372,6 @@ TVRead::getByHierarchicalName( const OUString& aName )
 return getByName( name );
 }
 
-
-
-
 sal_Bool SAL_CALL
 TVRead::hasByHierarchicalName( const OUString& aName )
 throw( RuntimeException )
@@ -418,17 +386,12 @@ TVRead::hasByHierarchicalName( const OUString& aName )
 return hasByName( name );
 }
 
-
-
 /**/
 /**/
 /*  TVChildTarget */
 /**/
 /**/
 
-
-
-
 extern "C" void start_handler(void *userData,
const XML_Char *name,
const XML_Char **atts)
@@ -466,7 +429,6 @@ extern "C" void start_handler(void *userData,
 }
 }
 
-
 extern "C" void end_handler(void *userData,
  const XML_Char *name )
 {
@@ -476,7 +438,6 @@ extern "C" void end_handler(void *userData,
 *tvDom = (*tvDom)->getParent();
 }
 
-
 extern "C" void data_handler( void *userData,
const XML_Char *s,
int len)
@@ -539,7 +500,6 @@ TVChildTarget::TVChildTarget( const Reference< 
XComponentContext >& xContext )
 Elements[i] = new TVRead( configData,tvDom.children[i] );
 }
 
-
 TVChildTarget::~TVChildTarget()
 {
 }
@@ -635,9 +595,6 @@ TVChildTarget::getByName( const OUString& aName )
 return aAny;
 }
 
-
-
-
 Sequence< OUString > SAL_CALL
 TVChildTarget::getElementNames( )
 throw( RuntimeException )
@@ -649,8 +606,6 @@ TVChildTarget::getElementNames( )
 return seq;
 }
 
-
-
 sal_Bool SAL_CALL
 TVChildTarget::hasByName( const OUString& aName )
 throw( RuntimeException

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

2013-06-06 Thread Mark Wielaard

 vcl/source/filter/jpeg/Exif.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 9bf4fb7094567ae64107faced69c25000a101cde
Author: Mark Wielaard 
Date:   Thu Jun 6 09:36:09 2013 +0200

Fix memory leak in Exif::processExif. Delete aExifData when done.

Change-Id: I1e63727fb8d587401c72775a14e7e3572b04fff5
Reviewed-on: https://gerrit.libreoffice.org/4171
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 
(cherry picked from commit 9645818f6817652568fe14c83c2dc46a9e5c3489)

diff --git a/vcl/source/filter/jpeg/Exif.cxx b/vcl/source/filter/jpeg/Exif.cxx
index 167cf54..f44b54f 100644
--- a/vcl/source/filter/jpeg/Exif.cxx
+++ b/vcl/source/filter/jpeg/Exif.cxx
@@ -213,6 +213,7 @@ bool Exif::processExif(SvStream& rStream, sal_uInt16 
aSectionLength, bool bSetVa
 
 if( 0x4949 != aTiffHeader->byteOrder || 0x002A != aTiffHeader->tagAlign )
 {
+delete[] aExifData;
 return false;
 }
 
@@ -231,6 +232,7 @@ bool Exif::processExif(SvStream& rStream, sal_uInt16 
aSectionLength, bool bSetVa
 rStream.Write(aExifData, aLength);
 }
 
+delete[] aExifData;
 return true;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Khaled Hosny

 vcl/coretext/ctlayout.cxx |   27 +++
 1 file changed, 3 insertions(+), 24 deletions(-)

New commits:
commit 2132e8e2145562499f31bfad5e3997cea4042b52
Author: Khaled Hosny 
Date:   Tue Jun 4 12:05:33 2013 +0200

Drop the trailing white space crack

Whatever this is, all it seems to do it to cause jitter when editing
text. The only place where this has any use is when editing RTL text
since Core Text seems to always place the trailing space on the right.

Change-Id: I35726775fb2a11761d264238fe702e58bbafd7fd

diff --git a/vcl/coretext/ctlayout.cxx b/vcl/coretext/ctlayout.cxx
index be9f0e3..e2b44c1 100644
--- a/vcl/coretext/ctlayout.cxx
+++ b/vcl/coretext/ctlayout.cxx
@@ -58,7 +58,6 @@ private:
 CTLineRef mpCTLine;
 
 int mnCharCount;// ==mnEndCharPos-mnMinCharPos
-int mnTrailingSpaces;
 
 // to prevent overflows
 // font requests get size limited by downscaling huge fonts
@@ -68,7 +67,6 @@ private:
 // cached details about the resulting layout
 // mutable members since these details are all lazy initialized
 mutable double  mfCachedWidth;  // cached value of resulting 
typographical width
-mutable double  mfTrailingSpaceWidth;   // in Pixels
 
 // x-offset relative to layout origin
 // currently only used in RTL-layouts
@@ -82,10 +80,8 @@ CTLayout::CTLayout( const CTTextStyle* pTextStyle )
 ,   mpAttrString( NULL )
 ,   mpCTLine( NULL )
 ,   mnCharCount( 0 )
-,   mnTrailingSpaces( 0 )
 ,   mfFontScale( pTextStyle->mfFontScale )
 ,   mfCachedWidth( -1 )
-,   mfTrailingSpaceWidth( 0 )
 ,   mnBaseAdv( 0 )
 {
 CFRetain( mpTextStyle->GetStyleDict() );
@@ -126,11 +122,6 @@ bool CTLayout::LayoutText( ImplLayoutArgs& rArgs )
 mpCTLine = CTLineCreateWithAttributedString( mpAttrString );
 CFRelease( aCFText);
 
-// get info about trailing whitespace to prepare for text justification in 
AdjustLayout()
-mnTrailingSpaces = 0;
-for( int i = mnEndCharPos; --i >= mnMinCharPos; ++mnTrailingSpaces )
-if( !IsSpacingGlyph( rArgs.mpStr[i] | GF_ISCHAR ))
-break;
 return true;
 }
 
@@ -141,17 +132,10 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 if( !mpCTLine)
 return;
 
-// CoreText fills trailing space during justification so we have to
-// take that into account when requesting CT to justify something
-mfTrailingSpaceWidth = CTLineGetTrailingWhitespaceWidth( mpCTLine );
-const int nTrailingSpaceWidth = rint( mfFontScale * mfTrailingSpaceWidth );
-
 int nOrigWidth = GetTextWidth();
-nOrigWidth -= nTrailingSpaceWidth;
 int nPixelWidth = rArgs.mnLayoutWidth;
 if( nPixelWidth )
 {
-nPixelWidth -= nTrailingSpaceWidth;
 if( nPixelWidth <= 0)
 return;
 }
@@ -159,13 +143,13 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 {
 // for now we are only interested in the layout width
 // TODO: use all mpDXArray elements for layouting
-nPixelWidth = rArgs.mpDXArray[ mnCharCount - 1 - mnTrailingSpaces ];
+nPixelWidth = rArgs.mpDXArray[ mnCharCount - 1 ];
 }
 
 // in RTL-layouts trailing spaces are leftmost
 // TODO: use BiDi-algorithm to thoroughly check this assumption
 if( rArgs.mnFlags & SAL_LAYOUT_BIDI_RTL)
-mnBaseAdv = nTrailingSpaceWidth;
+mnBaseAdv = rint( CTLineGetTrailingWhitespaceWidth( mpCTLine ) * 
mfFontScale );
 
 // return early if there is nothing to do
 if( nPixelWidth <= 0 )
@@ -188,7 +172,6 @@ void CTLayout::AdjustLayout( ImplLayoutArgs& rArgs )
 CFRelease( mpCTLine );
 mpCTLine = pNewCTLine;
 mfCachedWidth = -1; // TODO: can we set it directly to target width we 
requested? For now we re-measure
-mfTrailingSpaceWidth = 0;
 }
 
 // ---
@@ -340,10 +323,9 @@ long CTLayout::GetTextWidth() const
 
 if( mfCachedWidth < 0.0 ) {
 mfCachedWidth = CTLineGetTypographicBounds( mpCTLine, NULL, NULL, 
NULL);
-mfTrailingSpaceWidth = CTLineGetTrailingWhitespaceWidth( mpCTLine);
 }
 
-const long nScaledWidth = lrint( mfFontScale * (mfCachedWidth + 
mfTrailingSpaceWidth));
+const long nScaledWidth = lrint( mfFontScale * mfCachedWidth );
 return nScaledWidth;
 }
 
@@ -355,9 +337,6 @@ long CTLayout::FillDXArray( sal_Int32* pDXArray ) const
 if( !pDXArray )
 return GetTextWidth();
 
-// check assumptions
-DBG_ASSERT( mfTrailingSpaceWidth==0.0, "CTLayout::FillDXArray() with 
fTSW!=0" );
-
 long nPixWidth = GetTextWidth();
 if( pDXArray ) {
 // initialize the result array
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Fridrich Štrba

 include/wntgccx/jni_md.h   |   35 
 include/wntgccx/sehandler.hxx  |   46 +
 vcl/source/window/window.cxx   |4 +--
 vcl/win/source/app/salinst.cxx |   10 
 vcl/win/source/app/saltimer.cxx|2 -
 vcl/win/source/gdi/salprn.cxx  |2 -
 vcl/win/source/window/salframe.cxx |2 -
 7 files changed, 91 insertions(+), 10 deletions(-)

New commits:
commit 057891e7a2721cdd204e1eef4051b2021d2c5c6b
Author: Fridrich Å trba 
Date:   Thu Jun 6 11:38:05 2013 +0200

Some more movement to mingw64 port

Change-Id: I6af3cb1ac205dae20feb5a35481071bc4232680b

diff --git a/include/wntgccx/jni_md.h b/include/wntgccx/jni_md.h
new file mode 100644
index 000..e77438d
--- /dev/null
+++ b/include/wntgccx/jni_md.h
@@ -0,0 +1,35 @@
+/* -*- 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 .
+ */
+
+/* Fake jni_md.h for use when cross-compiling to Windows */
+
+#ifndef JNI_MD_H_INCLUDED
+#define JNI_MD_H_INCLUDED
+
+#define JNIEXPORT __declspec (dllexport)
+#define JNIIMPORT __declspec (dllimport)
+#define JNICALL   __stdcall
+
+typedef long jint;
+typedef __int64 jlong;
+typedef char jbyte;
+
+#endif /* JNI_MD_H_INCLUDED */
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/wntgccx/sehandler.hxx b/include/wntgccx/sehandler.hxx
new file mode 100644
index 000..49bd0f2
--- /dev/null
+++ b/include/wntgccx/sehandler.hxx
@@ -0,0 +1,46 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+
+/* From mingw-w64 excpt.h */
+
+#ifndef _SEHANDLER_HXX
+#define _SEHANDLER_HXX
+
+#if !defined( __MINGW32__ ) || !defined ( _WIN64 )
+#error This file should be included only in a 64-bit MinGW compilation
+#endif
+
+#ifdef __try
+#undef __try
+#endif
+
+#if 0
+#define __try \
+  __asm__ __volatile__ ("\t.l_startw:\n" \
+  );
+#else
+#define __try \
+  if (true)
+#endif
+
+#ifdef __except
+#undef __except
+#endif
+
+#if 0
+#define __except(exvalue) \
+  __asm__ __volatile__ ("\tnop\n" \
+  "\t.seh_handler __C_specific_handler, @except\n" \
+  "\t.seh_handlerdata\n" \
+  "\t.long 1\n" \
+  "\t.rva .l_startw, .l_endw, " __MINGW64_STRINGIFY(exvalue) " ,.l_endw\n" \
+  "\t.text\n" \
+  "\t.l_endw: nop\n" \
+  );
+#else
+#define __except(exvalue) \
+  if (false)
+#endif
+
+
+#endif // _SEHANDLER_HXX
+
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index e69dd35..c76e2d7 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8363,8 +8363,8 @@ uno::Reference< XDragSource > Window::GetDragSource()
 #if defined WNT
 aDragSourceSN = 
OUString("com.sun.star.datatransfer.dnd.OleDragSource");
 aDropTargetSN = 
OUString("com.sun.star.datatransfer.dnd.OleDropTarget");
-aDragSourceAL[ 1 ] = makeAny( (sal_uInt32) pEnvData->hWnd 
);
-aDropTargetAL[ 0 ] = makeAny( (sal_uInt32) pEnvData->hWnd 
);
+aDragSourceAL[ 1 ] = makeAny( static_cast( 
reinterpret_cast(pEnvData->hWnd) ) );
+aDropTargetAL[ 0 ] = makeAny( static_cast( 
reinterpret_cast(pEnvData->hWnd) ) );
 #elif defined MACOSX
 /* FIXME: Mac OS X specific dnd interface does not exist! *
  * Using Windows based dnd as a temporary solution*/
diff --git a/vcl/win/source/app/salinst.cxx b/vcl/win/source/app/salinst.cxx
index 7da838c..0cbbc5b 100644
--- a/vcl/win/source/app/salinst.cxx
+++ b/vcl/win/source/app/salinst.cxx
@@ -797,7 +797,7 @@ LRESULT CALLBACK SalComWndProcA( HWND hWnd, UINT nMsg, 
WPARAM wParam, LPARAM lPa
 {
 int bDef = TRUE;
 LRESULT nRet = 0;
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
 jmp_buf jmpbuf;
 __SEHandler han;
 if (__builtin_setjmp(jmpbuf) == 0)
@@ -809,7 +809,7 @@ LRESULT CALLBACK SalComWndProcA( HWND hWnd, UINT nMsg, 
WPARAM wParam, LPARAM lPa
 #endif
 nRet = SalComWndProc( hWnd, nMsg, wParam, lParam, bDef );
 }
-#ifdef __MINGW32__
+#if defined ( __MINGW32__ ) && !defined ( _WIN64 )
 han.Reset();
 #else
 
__except(

[Libreoffice-commits] core.git: sd/AllLangResTarget_sd.mk sd/inc sd/source sd/uiconfig sd/UIConfig_simpress.mk

2013-06-06 Thread Faisal M . Al-Otaibi

 sd/AllLangResTarget_sd.mk |1 
 sd/UIConfig_simpress.mk   |1 
 sd/inc/helpids.h  |1 
 sd/source/ui/dlg/tpoption.cxx |   44 +++---
 sd/source/ui/dlg/tpoption.src |   75 -
 sd/source/ui/inc/tpoption.hrc |6 --
 sd/source/ui/inc/tpoption.hxx |9 +--
 sd/uiconfig/simpress/ui/sdviewpage.ui |  101 ++
 8 files changed, 127 insertions(+), 111 deletions(-)

New commits:
commit a638554c02871005e3741ea71ecd59b5fd340809
Author: Faisal M. Al-Otaibi 
Date:   Thu Jun 6 11:31:34 2013 +0200

Convert sd view page to .ui

Change-Id: If199b877b762780e4c18b15025454f0dc7912dcd

diff --git a/sd/AllLangResTarget_sd.mk b/sd/AllLangResTarget_sd.mk
index dca617e..5466ad3 100644
--- a/sd/AllLangResTarget_sd.mk
+++ b/sd/AllLangResTarget_sd.mk
@@ -66,7 +66,6 @@ $(eval $(call gb_SrsTarget_add_files,sd/res,\
 sd/source/ui/dlg/sdpreslt.src \
 sd/source/ui/dlg/tabtempl.src \
 sd/source/ui/dlg/tpaction.src \
-sd/source/ui/dlg/tpoption.src \
 sd/source/ui/dlg/vectdlg.src \
 sd/source/ui/slideshow/slideshow.src \
 sd/source/ui/table/TableDesignPane.src \
diff --git a/sd/UIConfig_simpress.mk b/sd/UIConfig_simpress.mk
index b9cb37e..db9f2c5 100644
--- a/sd/UIConfig_simpress.mk
+++ b/sd/UIConfig_simpress.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_UIConfig_add_toolbarfiles,modules/simpress,\
 $(eval $(call gb_UIConfig_add_uifiles,modules/simpress,\
sd/uiconfig/simpress/ui/definecustomslideshow \
sd/uiconfig/simpress/ui/masterlayoutdlg \
+   sd/uiconfig/simpress/ui/sdviewpage \
sd/uiconfig/simpress/ui/presentationdialog \
sd/uiconfig/simpress/ui/printeroptions \
sd/uiconfig/simpress/ui/photoalbum \
diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index f85f603..b9ba1cb 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -44,7 +44,6 @@
 #define HID_SD_BTN_HANDOUT  
"SD_HID_SD_BTN_HANDOUT"
 #define HID_SD_WIN_DOCUMENT 
"SD_HID_SD_WIN_DOCUMENT"
 #define HID_SD_OPTIONS_LAYOUT   
"SD_HID_SD_OPTIONS_LAYOUT"
-#define HID_SD_OPTIONS_CONTENTS 
"SD_HID_SD_OPTIONS_CONTENTS"
 #define HID_SD_EFFECT_PREVIEW   
"SD_HID_SD_EFFECT_PREVIEW"
 #define HID_SD_CTL_NEWFOIL  
"SD_HID_SD_CTL_NEWFOIL"
 #define HID_SD_NAVIGATOR_TLB
"SD_HID_SD_NAVIGATOR_TLB"
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index b3084b4..da1321a 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -135,14 +135,12 @@ SfxTabPage* SdTpOptionsSnap::Create( Window* pWindow,
 \/
 
 SdTpOptionsContents::SdTpOptionsContents( Window* pParent, const SfxItemSet& 
rInAttrs  ) :
-SfxTabPage  ( pParent, SdResId( TP_OPTIONS_CONTENTS ), 
rInAttrs ),
-aGrpDisplay ( this, SdResId( GRP_DISPLAY ) ),
-aCbxRuler   ( this, SdResId( CBX_RULER ) ),
-aCbxDragStripes ( this, SdResId( CBX_HELPLINES ) ),
-aCbxHandlesBezier   ( this, SdResId( CBX_HANDLES_BEZIER ) ),
-aCbxMoveOutline ( this, SdResId( CBX_MOVE_OUTLINE ) )
+SfxTabPage ( pParent, "SdViewPage", "modules/simpress/ui/sdviewpage.ui", 
rInAttrs )
 {
-FreeResource();
+get( m_pCbxRuler, "ruler");
+get( m_pCbxDragStripes, "dragstripes");
+get( m_pCbxHandlesBezier, "handlesbezier");
+get( m_pCbxMoveOutline, "moveoutline");
 }
 
 // ---
@@ -157,17 +155,17 @@ sal_Bool SdTpOptionsContents::FillItemSet( SfxItemSet& 
rAttrs )
 {
 sal_Bool bModified = sal_False;
 
-if( aCbxRuler.GetSavedValue()   != aCbxRuler.IsChecked() ||
-aCbxMoveOutline.GetSavedValue() != aCbxMoveOutline.IsChecked() ||
-aCbxDragStripes.GetSavedValue() != aCbxDragStripes.IsChecked() ||
-aCbxHandlesBezier.GetSavedValue()   != aCbxHandlesBezier.IsChecked() )
+if( m_pCbxRuler->GetSavedValue()   != m_pCbxRuler->IsChecked() ||
+m_pCbxMoveOutline->GetSavedValue() != 
m_pCbxMoveOutline->IsChecked() ||
+m_pCbxDragStripes->GetSavedValue() != 
m_pCbxDragStripes->IsChecked() ||
+m_pCbxHandlesBezier->GetSavedValue()   != 
m_pCbxHandlesBezier->IsChecked() )
 {
 SdOptionsLayoutItem aOptsItem( ATTR_OPTIONS_LAYOUT );
 
-aOptsItem.GetOptionsLayout().SetRulerVisible( aCbxRuler.IsChecked() );
-aOptsItem.GetOptionsLayout().SetMoveOutline( 
aCbxMoveOutline.IsChecked() );
-aOptsItem.GetOptionsLayout().SetDragStripes( 
aCbxDragStripes.IsChecked() );
-aOptsItem.GetOptionsLayout().SetHandlesBezier( 
aCbxHandlesBezier.IsChecked()

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

2013-06-06 Thread Michael Stahl

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

New commits:
commit e6af366e1941e6166efd6ec2ba3b288ea51cbb34
Author: Michael Stahl 
Date:   Thu Jun 6 11:40:18 2013 +0200

Revert "configure: add evil hack to disable doxygen on a certain tinderbox"

This reverts commit ea9b4a69469cbd8bdbbd972638612632adf31d66.

diff --git a/configure.ac b/configure.ac
index a9c962f..a00c317 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6966,7 +6966,7 @@ dnl 
===
 if test "$enable_odk" = no; then
 unset DOXYGEN
 else
-if test "$with_doxygen" = no -o `hostname 2>/dev/null` = "tpa10"; then
+if test "$with_doxygen" = no; then
 AC_MSG_CHECKING([for doxygen])
 unset DOXYGEN
 AC_MSG_RESULT([no])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread abdulmajeed ahmed

 sc/AllLangResTarget_sc.mk  |1 
 sc/UIConfig_scalc.mk   |1 
 sc/inc/helpids.h   |1 
 sc/inc/sc.hrc  |1 
 sc/source/ui/inc/opredlin.hrc  |   32 --
 sc/source/ui/inc/opredlin.hxx  |   13 --
 sc/source/ui/optdlg/opredlin.cxx   |   91 -
 sc/source/ui/src/opredlin.src  |   97 --
 sc/source/ui/src/scstring.src  |5 
 sc/uiconfig/scalc/ui/optchangespage.ui |  170 +
 10 files changed, 223 insertions(+), 189 deletions(-)

New commits:
commit de72699615bd2d12257d1a295e541ed5117fe28c
Author: abdulmajeed ahmed 
Date:   Thu Jun 6 11:57:54 2013 +0200

Convert Changes tab page to .ui

Change-Id: I9d1ff420730ec9ec17e1b33f6b7180b9b89a33c4

diff --git a/sc/AllLangResTarget_sc.mk b/sc/AllLangResTarget_sc.mk
index 1230786..acf0911 100644
--- a/sc/AllLangResTarget_sc.mk
+++ b/sc/AllLangResTarget_sc.mk
@@ -54,7 +54,6 @@ $(eval $(call gb_SrsTarget_add_files,sc/res,\
 sc/source/ui/src/tabopdlg.src \
 sc/source/ui/src/scstring.src \
 sc/source/ui/src/dbnamdlg.src \
-sc/source/ui/src/opredlin.src \
 sc/source/ui/src/sortdlg.src \
 sc/source/ui/src/filter.src \
 sc/source/ui/src/colorformat.src \
diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index f29ba07..a9b2e6a 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/leftheaderdialog \
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/optcalculatepage \
+   sc/uiconfig/scalc/ui/optchangespage \
sc/uiconfig/scalc/ui/optdefaultpage \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 9744a35..2037945 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -109,7 +109,6 @@
 #define HID_COLROWNAMERANGES
"SC_HID_COLROWNAMERANGES"
 
 #define HID_FUNCTION_BOX
"SC_HID_FUNCTION_BOX"
-#define HID_SCPAGE_OPREDLINE
"SC_HID_SCPAGE_OPREDLINE"
 #define HID_SC_REDLIN_CTR   
"SC_HID_SC_REDLIN_CTR"
 
 // Hilfe IDs fuer Objekt- und Werkzeugleisten (max.10) ---
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 6fbe3f0..7b823b0 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -829,6 +829,7 @@
 #define SCSTR_ORIENTATION_TOPBOTTOM (STR_START + 110)
 #define SCSTR_ORIENTATION_BOTTOMTOP (STR_START + 111)
 #define SCSTR_ORIENTATION_STANDARD  (STR_START + 112)
+#define SCSTR_AUTHOR(STR_START + 113)
 
 // accessibility
 
diff --git a/sc/source/ui/inc/opredlin.hrc b/sc/source/ui/inc/opredlin.hrc
deleted file mode 100644
index 3b5b92c..000
--- a/sc/source/ui/inc/opredlin.hrc
+++ /dev/null
@@ -1,32 +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 "sc.hrc"   // -> RID_SCPAGE_OPREDLINE
-
-#define FT_CONTENT  1
-#define FT_REMOVE   2
-#define FT_INSERT   3
-#define FT_MOVE 4
-#define GB_COLORCHGS1
-#define CLB_CONTENT 1
-#define CLB_REMOVE  2
-#define CLB_INSERT  3
-#define CLB_MOVE4
-#define STR_AUTHOR  1
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx
index c461352..6236b01 100644
--- a/sc/source/ui/inc/opredlin.hxx
+++ b/sc/source/ui/inc/opredlin.hxx
@@ -36,15 +36,10 @@
 
 class ScRedlineOptionsTabPage : public SfxTabPage
 {
-FixedText   aContentFT;
-ColorListBoxaContentColorLB;
-FixedText   aRemoveFT;
-ColorListBoxaRemoveColorLB;
-FixedText   aInsertFT;
-ColorListBoxaInsertColorLB;
-FixedText   aMoveFT;
-ColorListBoxaMoveColorLB;
-FixedLine   aChangedGB;
+ColorListBox*   m_pContentColorLB;
+ColorListBox*   m_pRemoveColorLB;
+C

[Bug 54157] LibreOffice 4.0 most annoying bugs

2013-06-06 Thread bugzilla-daemon

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

Bug 54157 depends on bug 59516, which changed state.

Bug 59516 Summary: FILEOPEN: Native MySQL-connector  couldnt be installed under 
Windows in LO 4.0
https://bugs.freedesktop.org/show_bug.cgi?id=59516

   What|Removed |Added

 Status|RESOLVED|UNCONFIRMED
 Resolution|FIXED   |---

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

[Libreoffice-commits] core.git: Changes to 'feature/firebird-sdbc'

2013-06-06 Thread Andres Gomez

New branch 'feature/firebird-sdbc' available with the following commits:
commit 95c4c296e028de6bf5158dbe7c70c10f6d0f8ac6
Author: Andres Gomez 
Date:   Wed Jun 5 18:16:49 2013 +0300

fb-sdbc: Pretty printing table log output

commit 16d173031a2656d7e36300a1989d77cc4d7ca8ed
Author: Javier Fernandez 
Date:   Thu Jun 6 08:27:34 2013 +

Implementing the FStatement::execute() method.

Change-Id: I661b8247a0dfaee970b4742b1114fe085cb8f4dd

commit 3f7832bb55451293d4600240476a3ec3c102
Author: Javier Fernandez 
Date:   Thu Jun 6 08:25:39 2013 +

Fixed crash at FStatement disposing stage.

Change-Id: I04fb2ded38a12b8501c49ccea81ee72fc7b002d1

commit bab6150c84cee30219a5dc3386192888f495f3c2
Author: Javier Fernandez 
Date:   Thu Jun 6 08:24:57 2013 +

The VARCHAR tye requires a maximum length.

Change-Id: I410dea61c8fe904bc11c801f370d1df97e116372

commit aeb8e7fe28b97daf17e0fc7d6215eec2023fd906
Author: Javier Fernandez 
Date:   Wed Jun 5 15:07:01 2013 +

GetTables uses now a Statement, instead of a PreparedStatement.

Change-Id: I8dee162d25360114931ed401d6a6c512ad0c3ec6

commit fee888daa2c40493c04fd34d630ebe87d439cefa
Author: Javier Fernandez 
Date:   Wed Jun 5 15:06:05 2013 +

Refactoring some code on the FStatement class.

Change-Id: Id172dde2f35538ac37b632f738fe5c2a87437832

commit c5cc994b731a289843a767e049befea228d1a08c
Author: Javier Fernandez 
Date:   Tue Jun 4 13:54:48 2013 +

Executing again a PreparedStatement.

Change-Id: I10afa596ed0464e14c4fd95d3a7fb687451a10b4

commit cebb47241e3a2a075ff214d10c4352c02053d7aa
Author: Andres Gomez 
Date:   Tue Jun 4 13:52:11 2013 +0300

fb-sdbc: added extra checks in FDriver

commit c697a70392272a0b866b06011c373f32ed0eed87
Author: Andres Gomez 
Date:   Tue Jun 4 16:41:28 2013 +0300

fb-sdbc: Added temporal debugging in dbaccess

commit f9755e8cb2548a93f7c34306206944350596dc0c
Author: Andres Gomez 
Date:   Tue Jun 4 13:09:47 2013 +0300

fb-sdbc: simplifying url comparison

commit 31870fee1d9beef0ce537061361fef8619bf36ff
Author: Andres Gomez 
Date:   Tue Jun 4 13:51:40 2013 +0300

fb-sdbc: Added logging support

Remember that in order to enable the logging
output it is needed to properly set the SAL_LOG
environment variable.

For example:

$ SAL_LOG="+INFO.connectivity.firebird" 
solver/unxlngx6/installation/opt/program/soffice.bin

commit d0eb26c30cfb80420cd0fb36313db2e0337a4dd9
Author: Andres Gomez 
Date:   Tue Jun 4 13:11:00 2013 +0300

fb-sdbc: test file moved to a generic place

commit 173a00cb55838f424364c1d6913ba53ed77022ce
Author: Javier Fernandez 
Date:   Mon Jun 3 23:25:45 2013 +

Dealing with parameters in Prepared Statement.

Change-Id: I1f94b7b4795c4a72ef8bf78bb032097094cda589

commit 86f8511cca92edf35f2b0fe6851e272856eef49a
Author: Javier Fernandez 
Date:   Mon May 27 21:06:48 2013 +

Adding debug info for tracking disposes and fixed a memory allocation bug.

Change-Id: Iae8a6dac26fd7d074ece6421ae61ecf7ce047b8f

commit 28c8baee278e341aab30e549a5d6f2d7a04932db
Author: Javier Fernandez 
Date:   Mon May 27 15:00:29 2013 +

Adding disposing bits.

Change-Id: I997c23d0c0765a6929be89087330ac6616ccd28c

commit cb6b541b30c0f18d7270a38c80a6ecef30a321a0
Author: Javier Fernandez 
Date:   Mon May 27 13:15:02 2013 +

using the new implementation of the PreparedStatement and ResultSet classes.

Change-Id: Ic0048c0408819bcad6cf8c80121cfdd3f76dce55

commit 7f63a510d6fac390a48e8cceb02b84c608a481fc
Author: Javier Fernandez 
Date:   Mon May 27 13:14:41 2013 +

Properly implementing the ResultSet class.

Change-Id: Ice2bd493cf016603d372fe7867cf1ec899f52d8b

commit 2e1513985a12f58021f03ee9d4e15becfb4d0b99
Author: Javier Fernandez 
Date:   Mon May 27 13:13:51 2013 +

Properly imÃ±emenmting the prepared statement class.

Change-Id: I6788bbedb339686d3f97ecb2338994617f373803

commit c7a726ef2846aa430d5e0e4d3841658b3f94eaa8
Author: Javier Fernandez 
Date:   Mon May 27 12:27:23 2013 +

Properly implementing the connection construction.

Change-Id: I6bb114d871697483a1a4246496f73252e5307534

commit 2be7f51d14a9c5c09ed310dea5058e72eadbd712
Author: Javier Fernandez 
Date:   Thu May 23 13:31:58 2013 +

Implementing the ResultSet interface.

Change-Id: I755533c5cb5af713d453b8e6ba7b734870e358a2

commit 358b46a56df542226021af2c347595354e457684
Author: Javier Fernandez 
Date:   Wed May 22 08:56:23 2013 +

Debug info and some API methods implementation.

  * getTypeInfo
  * getTables
  * prepared statements.

Change-Id: I549f4a9468b5346e22479363fe0fb81039bc6665

commit a19f942743b83a1a4f654131b67b3d608b80103a
Author: Javier Fernandez 
Date:   Wed May 22 08:55:08 2013 +

Added include and linking directives for building the firebird-sdbc driver.

Change-Id: I2126bc5ca0edc33f

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8d/e6941efffd22214da577ff637b2522e46c7fa5

2013-06-06 Thread Caolán McNamara

 8d/e6941efffd22214da577ff637b2522e46c7fa5 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b29a33225108f98307e016829f0e991434ff3d1f
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 12:01:15 2013 +0100

Notes added by 'git notes add'

diff --git a/8d/e6941efffd22214da577ff637b2522e46c7fa5 
b/8d/e6941efffd22214da577ff637b2522e46c7fa5
new file mode 100644
index 000..43a458a
--- /dev/null
+++ b/8d/e6941efffd22214da577ff637b2522e46c7fa5
@@ -0,0 +1 @@
+merged as: 56ab9c1289ee284fe0f48e46101cbf55e24db1e2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Caolán McNamara

 include/oox/drawingml/chart/converterbase.hxx |1 
 oox/source/drawingml/chart/titleconverter.cxx |   21 --
 writerfilter/source/dmapper/SdtHelper.cxx |5 ++--
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |3 ++
 writerfilter/source/ooxml/OOXMLParserState.cxx|3 ++
 5 files changed, 29 insertions(+), 4 deletions(-)

New commits:
commit b5d93a58a7f4e23432f18da0946bac04027c23a8
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 11:58:23 2013 +0100

valgrind: uninit variable

Change-Id: I5640291d9e221c9cffd7daec9d46a313fddfaf4e

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index 031b70f..58c092f 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -62,8 +62,9 @@ awt::Size lcl_getOptimalWidth(StyleSheetTablePtr pStyleSheet, 
OUString& rDefault
 return awt::Size(nWidth + nBorder + nHeight, nHeight + nBorder);
 }
 
-SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl):
-m_rDM_Impl(rDM_Impl)
+SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl)
+: m_rDM_Impl(rDM_Impl)
+, m_bHasElements(false)
 {
 }
 
commit fa671cecd4bb2f38a0a9171cfdbb56efddda1cfa
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 11:41:03 2013 +0100

add some checks against NULL derefs

Change-Id: I85fbf279991ee361ea081d92d9acc84d36677af1

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index f4a7924..205f821 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1335,6 +1335,9 @@ void OOXMLFastContextHandlerProperties::lcl_endFastElement
 {
 if (isForwardEvents())
 {
+SAL_WARN_IF(!mpStream, "writerfilter", "no stream to set 
properties on");
+if (!mpStream)
+return;
 mpStream->props(mpPropertySet);
 }
 }
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx 
b/writerfilter/source/ooxml/OOXMLParserState.cxx
index d8b562b..1b9b426 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -125,6 +125,9 @@ OOXMLDocument * OOXMLParserState::getDocument() const
 
 void OOXMLParserState::setXNoteId(const sal_Int32 nId)
 {
+SAL_WARN_IF(!mpDocument, "writerfilter", "no document to set note id on");
+if (!mpDocument)
+return;
 mpDocument->setXNoteId(nId);
 }
 
commit 56ab9c1289ee284fe0f48e46101cbf55e24db1e2
Author: Jian Fang Zhang 
Date:   Fri Sep 14 14:00:22 2012 +

Resolves: #i119547# support the chart legend positon of top&&left...

just set the Anchor to Alignment_TOP_RIGHT

Found by: Shan Zhu
Patch by: zhaoshzh
Review by: zhangjf

(cherry picked from commit 8de6941efffd22214da577ff637b2522e46c7fa5)

Conflicts:
oox/inc/oox/drawingml/chart/converterbase.hxx
oox/source/drawingml/chart/titleconverter.cxx

Change-Id: Iad1fe1af8f93e6904759c10a9c9206fd1f1aebbb

diff --git a/include/oox/drawingml/chart/converterbase.hxx 
b/include/oox/drawingml/chart/converterbase.hxx
index 21a0344..dea77de 100644
--- a/include/oox/drawingml/chart/converterbase.hxx
+++ b/include/oox/drawingml/chart/converterbase.hxx
@@ -140,6 +140,7 @@ public:
 boolconvertFromModel(
 const ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >& rxShape,
 double fRotationAngle );
+bool getAutoLayout(){return mrModel.mbAutoLayout;}
 };
 
 // 
diff --git a/oox/source/drawingml/chart/titleconverter.cxx 
b/oox/source/drawingml/chart/titleconverter.cxx
index 32fb37f..533db6a 100644
--- a/oox/source/drawingml/chart/titleconverter.cxx
+++ b/oox/source/drawingml/chart/titleconverter.cxx
@@ -31,7 +31,10 @@
 #include "oox/drawingml/chart/datasourceconverter.hxx"
 #include "oox/drawingml/chart/titlemodel.hxx"
 #include "oox/helper/containerhelper.hxx"
+#include 
+#include 
 
+#include "oox/drawingml/chart/modelbase.hxx"
 namespace oox {
 namespace drawingml {
 namespace chart {
@@ -41,6 +44,7 @@ namespace chart {
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::chart2;
 using namespace ::com::sun::star::chart2::data;
+using namespace ::com::sun::star::drawing;
 using namespace ::com::sun::star::uno;
 
 using ::oox::core::XmlFilterBase;
@@ -204,6 +208,8 @@ void LegendConverter::convertFromModel( const Reference< 
XDiagram >& rxDiagram )
 // predefined legend position and expansion
 cssc2::LegendPosition eLegendPos = cssc2::LegendPosition_CUSTOM;
 cssc::ChartLegendExpansion eLegendExpand = 
cssc::ChartLegendExpansion_CUSTOM;
+RelativePosition eRelPos;
+bool bTopRight=0;
 switch(

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

2013-06-06 Thread Caolán McNamara

 writerfilter/source/dmapper/SdtHelper.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 294002ab56e82865943b549c22ca1049e14b79bb
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 11:58:23 2013 +0100

valgrind: uninit variable

Change-Id: I5640291d9e221c9cffd7daec9d46a313fddfaf4e
(cherry picked from commit b5d93a58a7f4e23432f18da0946bac04027c23a8)

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index 031b70f..58c092f 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -62,8 +62,9 @@ awt::Size lcl_getOptimalWidth(StyleSheetTablePtr pStyleSheet, 
OUString& rDefault
 return awt::Size(nWidth + nBorder + nHeight, nHeight + nBorder);
 }
 
-SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl):
-m_rDM_Impl(rDM_Impl)
+SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl)
+: m_rDM_Impl(rDM_Impl)
+, m_bHasElements(false)
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread abdulmajeed ahmed

 sc/UIConfig_scalc.mk |1 
 sc/inc/helpids.h |1 
 sc/source/ui/inc/optdlg.hrc  |4 -
 sc/source/ui/inc/tpcompatibility.hxx |4 -
 sc/source/ui/optdlg/tpcompatibility.cxx  |   17 ++---
 sc/source/ui/src/optdlg.src  |   38 ---
 sc/uiconfig/scalc/ui/optcompatibilitypage.ui |   90 +++
 7 files changed, 99 insertions(+), 56 deletions(-)

New commits:
commit dc676d9d7a2aa92758e97208d4c6e641d2798664
Author: abdulmajeed ahmed 
Date:   Thu Jun 6 13:01:34 2013 +0200

Convert Compatibility tab page to .ui

Change-Id: I97e5ecfb800443e41b2d9a88731cc530600a7b1c

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index a9b2e6a..8fc9e35 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -81,6 +81,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/managenamesdialog \
sc/uiconfig/scalc/ui/optcalculatepage \
sc/uiconfig/scalc/ui/optchangespage \
+   sc/uiconfig/scalc/ui/optcompatibilitypage \
sc/uiconfig/scalc/ui/optdefaultpage \
sc/uiconfig/scalc/ui/printeroptions \
sc/uiconfig/scalc/ui/protectsheetdlg \
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 2037945..afef8bb 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -63,7 +63,6 @@
 #define HID_SCPAGE_FORMULA  
"SC_HID_SCPAGE_FORMULA"
 #define HID_SCPAGE_USERLISTS
"SC_HID_SCPAGE_USERLISTS"
 #define HID_SCPAGE_AREAS
"SC_HID_SCPAGE_AREAS"
-#define HID_SCPAGE_COMPATIBILITY
"SC_HID_SCPAGE_COMPATIBILITY"
 #define HID_SCPAGE_SUBT_GROUP1  
"SC_HID_SCPAGE_SUBT_GROUP1"
 #define HID_SCPAGE_SUBT_GROUP2  
"SC_HID_SCPAGE_SUBT_GROUP2"
 #define HID_SCPAGE_SUBT_GROUP3  
"SC_HID_SCPAGE_SUBT_GROUP3"
diff --git a/sc/source/ui/inc/optdlg.hrc b/sc/source/ui/inc/optdlg.hrc
index 78fdf85..4103d54 100644
--- a/sc/source/ui/inc/optdlg.hrc
+++ b/sc/source/ui/inc/optdlg.hrc
@@ -147,9 +147,5 @@
 #define FT_ODF_RECALC 99
 #define LB_ODF_RECALC100
 
-// TP_COMPATIBILITY
-#define FL_KEY_BINDINGS   1
-#define FT_KEY_BINDINGS   2
-#define LB_KEY_BINDINGS   3
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/inc/tpcompatibility.hxx 
b/sc/source/ui/inc/tpcompatibility.hxx
index 67b906c..01d74f4 100644
--- a/sc/source/ui/inc/tpcompatibility.hxx
+++ b/sc/source/ui/inc/tpcompatibility.hxx
@@ -30,9 +30,7 @@ private:
 virtual ~ScTpCompatOptions();
 
 private:
-FixedLine maFlKeyBindings;
-FixedText maFtKeyBindings;
-ListBox   maLbKeyBindings;
+ListBox*   m_pLbKeyBindings;
 };
 
 #endif
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx 
b/sc/source/ui/optdlg/tpcompatibility.cxx
index 00f9ef4..3aa1b60 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -16,12 +16,9 @@
 #include "appoptio.hxx"
 
 ScTpCompatOptions::ScTpCompatOptions(Window *pParent, const SfxItemSet 
&rCoreAttrs) :
-SfxTabPage(pParent, ScResId(RID_SCPAGE_COMPATIBILITY), rCoreAttrs),
-maFlKeyBindings(this, ScResId(FL_KEY_BINDINGS)),
-maFtKeyBindings(this, ScResId(FT_KEY_BINDINGS)),
-maLbKeyBindings(this, ScResId(LB_KEY_BINDINGS))
+SfxTabPage(pParent, 
"OptCompatibilityPage","modules/scalc/ui/optcompatibilitypage.ui", rCoreAttrs)
 {
-FreeResource();
+get(m_pLbKeyBindings,"keybindings");
 }
 
 ScTpCompatOptions::~ScTpCompatOptions()
@@ -36,11 +33,11 @@ SfxTabPage* ScTpCompatOptions::Create(Window *pParent, 
const SfxItemSet &rCoreAt
 sal_Bool ScTpCompatOptions::FillItemSet(SfxItemSet &rCoreAttrs)
 {
 bool bRet = false;
-if (maLbKeyBindings.GetSavedValue() != maLbKeyBindings.GetSelectEntryPos())
+if (m_pLbKeyBindings->GetSavedValue() != 
m_pLbKeyBindings->GetSelectEntryPos())
 {
 rCoreAttrs.Put(
 SfxUInt16Item(
-SID_SC_OPT_KEY_BINDING_COMPAT, 
maLbKeyBindings.GetSelectEntryPos()));
+SID_SC_OPT_KEY_BINDING_COMPAT, 
m_pLbKeyBindings->GetSelectEntryPos()));
 bRet = true;
 }
 return bRet;
@@ -58,17 +55,17 @@ void ScTpCompatOptions::Reset(const SfxItemSet &rCoreAttrs)
 switch (eKeyB)
 {
 case ScOptionsUtil::KEY_DEFAULT:
-maLbKeyBindings.SelectEntryPos(0);
+m_pLbKeyBindings->SelectEntryPos(0);
 break;
 case ScOptionsUtil::KEY_OOO_LEGACY:
-maLbKeyBindings.SelectEntryPos(1);
+m_pLbKeyBindings->SelectEntryPos(1);
 break;
 default:
 ;
 }
 }
 
-maLbKeyBindings.SaveValue();
+m_pLbKeyBindings->SaveValue();
 }
 
 int ScTpCompatOptions::DeactivatePage(S

[Libreoffice-commits] core.git: helpcontent2

2013-06-06 Thread Caolán McNamara

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

New commits:
commit bdecd8d71eb0b858b6000b05deb71aa7a7e44675
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 12:12:19 2013 +0100

Updated core
Project: help  122381b674ee2c4bb65659945a454dfb912621a2

diff --git a/helpcontent2 b/helpcontent2
index 9673672..122381b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9673672d0430d12aec5162f69ebf25e2c84c6e89
+Subproject commit 122381b674ee2c4bb65659945a454dfb912621a2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sd/inc sd/uiconfig

2013-06-06 Thread Caolán McNamara

 sd/inc/helpids.h  |1 -
 sd/uiconfig/simpress/ui/sdviewpage.ui |5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5b2f1615b8af296114f514b73e4dfeb4b188679d
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 12:14:18 2013 +0100

drop unused help ids

Change-Id: I7e0e9a09c6b9d36c0b9d02ab11f7bad051c01b9a

diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h
index b9ba1cb..8fb2364 100644
--- a/sd/inc/helpids.h
+++ b/sd/inc/helpids.h
@@ -25,7 +25,6 @@
 #define HID_SDOUTLINEVIEWSHELL  
"SD_HID_SDOUTLINEVIEWSHELL"
 #define HID_SD_PRINT_OPTIONS
"SD_HID_SD_PRINT_OPTIONS"
 #define HID_SD_OPTIONS_SNAP 
"SD_HID_SD_OPTIONS_SNAP"
-#define HID_SD_OPTIONS_VIEW 
"SD_HID_SD_OPTIONS_VIEW"
 #define HID_SD_AUTOPILOT_PAGE1  
"SD_HID_SD_AUTOPILOT_PAGE1"
 #define HID_SD_AUTOPILOT_PAGE2  
"SD_HID_SD_AUTOPILOT_PAGE2"
 #define HID_SD_AUTOPILOT_PAGE3  
"SD_HID_SD_AUTOPILOT_PAGE3"
commit a188916c8a0dba987dd26837ede4d5f6042e72bc
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 12:05:34 2013 +0100

HIG set 6 pixel spacing between rows

Change-Id: I6933ffd0e095fa23108b86675714f0bf7510a101

diff --git a/sd/uiconfig/simpress/ui/sdviewpage.ui 
b/sd/uiconfig/simpress/ui/sdviewpage.ui
index 25d5d5c..50b99bd 100644
--- a/sd/uiconfig/simpress/ui/sdviewpage.ui
+++ b/sd/uiconfig/simpress/ui/sdviewpage.ui
@@ -19,9 +19,10 @@
 True
 False
 vertical
+6
 
   
-Rulers 
_visible
+_Rulers 
visible
 True
 True
 False
@@ -69,7 +70,7 @@
 
 
   
-Co_ntour of each 
individual object
+_Contour of each 
individual object
 True
 True
 False
___
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

2013-06-06 Thread Caolán McNamara

 helpers/help_hid.lst |6 --
 source/text/shared/optionen/01070100.xhp |   22 ++
 2 files changed, 10 insertions(+), 18 deletions(-)

New commits:
commit 122381b674ee2c4bb65659945a454dfb912621a2
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 12:12:19 2013 +0100

update help ids for draw/impress view options .ui conversion

Change-Id: I6ff3f9d47e26f466915b5461f575c72f0eea4632

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index ba6d7f7..c9e1aa3 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3414,10 +3414,8 @@ HID_SD_NAVIGATOR_TBI_PREV,59803,
 HID_SD_NAVIGATOR_TBI_SHAPE_FILTER,59807,
 HID_SD_NAVIGATOR_TBX,59798,
 HID_SD_NAVIGATOR_TLB,59793,
-HID_SD_OPTIONS_CONTENTS,59789,
 HID_SD_OPTIONS_LAYOUT,59788,
 HID_SD_OPTIONS_SNAP,59769,
-HID_SD_OPTIONS_VIEW,59770,
 HID_SD_PAGEOBJSTLB,59895,
 HID_SD_PRINT_OPTIONS,59768,
 HID_SD_RECENT_MASTERS,59907,
@@ -6810,10 +6808,6 @@ 
sd_CheckBox_RID_TP_CUSTOMANIMATION_EFFECT_CB_AUTORESTART,878822408,
 sd_CheckBox_RID_TP_CUSTOMANIMATION_EFFECT_CB_SMOOTH_END,878822407,
 sd_CheckBox_RID_TP_CUSTOMANIMATION_EFFECT_CB_SMOOTH_START,878822406,
 sd_CheckBox_RID_TP_CUSTOMANIMATION_ENTRANCE_CBX_PREVIEW,878871556,
-sd_CheckBox_TP_OPTIONS_CONTENTS_CBX_HANDLES_BEZIER,546653186,
-sd_CheckBox_TP_OPTIONS_CONTENTS_CBX_HELPLINES,546653185,
-sd_CheckBox_TP_OPTIONS_CONTENTS_CBX_MOVE_OUTLINE,546653199,
-sd_CheckBox_TP_OPTIONS_CONTENTS_CBX_RULER,546653198,
 sd_CheckBox_TP_PRINT_OPTIONS_CBX_BACK,545866765,
 sd_CheckBox_TP_PRINT_OPTIONS_CBX_DATE,545866755,
 sd_CheckBox_TP_PRINT_OPTIONS_CBX_DRAW,545866758,
diff --git a/source/text/shared/optionen/01070100.xhp 
b/source/text/shared/optionen/01070100.xhp
index 4d41253..49f1051 100644
--- a/source/text/shared/optionen/01070100.xhp
+++ b/source/text/shared/optionen/01070100.xhp
@@ -36,25 +36,23 @@
 control point display in presentations
 BÃ©zier curves; control points in 
presentations
 mw made "line contours..." a two level 
entryremoved "placeholder" entries, see i81634
-
-View
-Specifies the available display 
modes. By selecting an alternative display, you can speed up the screen 
display while editing your presentation.
+View
+Specifies the 
available display modes. By selecting an alternative display, you can 
speed up the screen display while editing your presentation.
 removed 4 options, see i81634Display
-Rulers visible
-Specifies 
whether to display the rulers at the top and to the left of the work 
area.
+Rulers visible
+Specifies whether 
to display the rulers at the top and to the left of the work 
area.
 
-
-Helplines While Moving
-Specifies whether to 
display guides when moving an object.
+Helplines While Moving
+Specifies whether to display 
guides when moving an object.
 
 %PRODUCTNAME 
creates dotted guides that extend beyond the box containing the selected object 
and which cover the entire work area, helping you position the object. 
 
 You also can use this function through the icon
 icon
 icon with the same 
name in the Options bar if a presentation or a drawing document is 
opened.
-All control points in BÃ©zier 
editor
-Displays the control 
points of all BÃ©zier points if you have previously selected a BÃ©zier 
curve. If the All control points in BÃ©zier editor option 
is not marked, only the control points of the selected BÃ©zier points will be 
visible.
-Contour of each individual object
-%PRODUCTNAME displays the contour line of each 
individual object when moving this object. The Contour of each 
individual object option enables you to see if single objects conflict 
with other objects in the target position. If you do not mark the Contour 
of each individual object option, %PRODUCTNAME only displays a square contour that 
includes all selected objects.
+All control points in BÃ©zier editor
+Displays 
the control points of all BÃ©zier points if you have previously selected a 
BÃ©zier curve. If the All control points in BÃ©zier 
editor option is not marked, only the control points of the selected BÃ©zier 
points will be visible.
+Contour of each individual object
+%PRODUCTNAME displays the contour line of each 
individual object when moving this object. The Contour of each 
individual object option enables you to see if single objects conflict 
with other objects in the target position. If you do not mark the Contour 
of each individual object option, %PRODUCTNAME only displays a square contour that 
includes all selected objects.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Publishing the MySQL Connector

2013-06-06 Thread Jesús Corrius

> I downloaded extension with Jesus Corrius url.
> Download is OK.
> Installation under Win 7 32bits with LO 4.0 and LO 4.1.0 beta1 is OK.
> Extension works correctly.
>
>
>
I can download the connector from the extensions site without any problem.
But there are some people still complaining that downloading it doesn't
work.

-- 
Jesús Corrius 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2013-06-06 Thread Caolán McNamara

 sc/uiconfig/scalc/ui/optchangespage.ui |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit bd20fe844d2e4cc3822cb9428a20c1ac7e468540
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 12:22:33 2013 +0100

set mnemonic widgets

Change-Id: Ia72029d54f2ddb111d1651809d7c63e68f010517

diff --git a/sc/uiconfig/scalc/ui/optchangespage.ui 
b/sc/uiconfig/scalc/ui/optchangespage.ui
index 1201c91..907da12 100644
--- a/sc/uiconfig/scalc/ui/optchangespage.ui
+++ b/sc/uiconfig/scalc/ui/optchangespage.ui
@@ -1,7 +1,7 @@
 
 
-  
   
+  
   
 True
 False
@@ -33,11 +33,10 @@
   
 True
 False
-True
 0
 Chan_ges
 True
-changeslb
+changes
   
   
 0
@@ -50,11 +49,10 @@
   
 True
 False
-True
 0
 _Deletions
 True
-deletionslb
+deletions
   
   
 0
@@ -67,11 +65,10 @@
   
 True
 False
-True
 0
 _Insertions
 True
-insertionslb
+insertions
   
   
 0
@@ -84,11 +81,10 @@
   
 True
 False
-True
 0
 _Moved 
entries
 True
-entrieslb
+entries
   
   
 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2013-06-06 Thread Caolán McNamara

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

New commits:
commit 3b6d097a51e4cb5151cbff5cb147af422c5e9dc0
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 12:27:50 2013 +0100

Updated core
Project: help  5082b0ad7ca566bde06de2f976f350a97c1cd6c0

diff --git a/helpcontent2 b/helpcontent2
index 122381b..5082b0a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 122381b674ee2c4bb65659945a454dfb912621a2
+Subproject commit 5082b0ad7ca566bde06de2f976f350a97c1cd6c0
___
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

2013-06-06 Thread Caolán McNamara

 helpers/help_hid.lst |5 -
 source/text/shared/optionen/01060600.xhp |   20 ++--
 2 files changed, 10 insertions(+), 15 deletions(-)

New commits:
commit 5082b0ad7ca566bde06de2f976f350a97c1cd6c0
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 12:27:50 2013 +0100

update help ids for calc changes options page .ui conversion

Change-Id: I630cf7aa39b18a6618d8f79a33c23ba068b3718e

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index c9e1aa3..199c677 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -3217,7 +3217,6 @@ HID_SCH_WIZARD_ROADMAP,63365,
 HID_SCPAGE_AREAS,58882,
 HID_SCPAGE_CONTENT,58892,
 HID_SCPAGE_LAYOUT,58893,
-HID_SCPAGE_OPREDLINE,58933,
 HID_SCPAGE_SUBT_GROUP,58876,
 HID_SCPAGE_SUBT_GROUP1,58885,
 HID_SCPAGE_SUBT_GROUP2,58886,
@@ -6639,10 +6638,6 @@ sc_ListBox_RID_SCPAGE_CONTENT_LB_DRAW,958189088,
 sc_ListBox_RID_SCPAGE_CONTENT_LB_OBJGRF,958189084,
 sc_ListBox_RID_SCPAGE_LAYOUT_LB_ALIGN,958205512,
 sc_ListBox_RID_SCPAGE_LAYOUT_LB_UNIT,958205502,
-sc_ListBox_RID_SCPAGE_OPREDLINE_CLB_CONTENT,958369281,
-sc_ListBox_RID_SCPAGE_OPREDLINE_CLB_INSERT,958369283,
-sc_ListBox_RID_SCPAGE_OPREDLINE_CLB_MOVE,958369284,
-sc_ListBox_RID_SCPAGE_OPREDLINE_CLB_REMOVE,958369282,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT1,956435972,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT2,956435973,
 sc_ListBox_RID_SCPAGE_SORT_FIELDS_LB_SORT3,956435974,
diff --git a/source/text/shared/optionen/01060600.xhp 
b/source/text/shared/optionen/01060600.xhp
index bd66c7a..ed4b9df 100644
--- a/source/text/shared/optionen/01060600.xhp
+++ b/source/text/shared/optionen/01060600.xhp
@@ -32,9 +32,9 @@
 
 
 
-
+
 Changes
-The Changes dialog 
specifies various options for highlighting recorded changes in 
documents.
+The Changes 
dialog specifies various options for highlighting recorded changes in 
documents.
 
 To record changes to your work, choose Edit - 
Changes.
 
@@ -42,17 +42,17 @@
 
 Color Definition for Changes
 Defines colors for recorded changes. If you select the "By author" 
entry, $[officename] will automatically set the color depending on the author 
who undertook the changes.
-
+
 Changes
-Specifies 
the color for changes of cell contents.
-
+Specifies the 
color for changes of cell contents.
+
 Deletions
-Specifies 
the color to highlight deletions in a document.
-
+Specifies the 
color to highlight deletions in a document.
+
 Insertions
-Specifies 
the color to highlight insertions in a document.
-
+Specifies 
the color to highlight insertions in a document.
+
 Moved entries
-Specifies the 
color to highlight moved cell contents.
+Specifies the 
color to highlight moved cell contents.
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2013-06-06 Thread Caolán McNamara

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

New commits:
commit 023d31bca34c844be54b30a8c13176a8b0792857
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 12:46:05 2013 +0100

Updated core
Project: help  76322cb521790cf7a592aafa3e378449037d1b30

diff --git a/helpcontent2 b/helpcontent2
index 5082b0a..76322cb 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5082b0ad7ca566bde06de2f976f350a97c1cd6c0
+Subproject commit 76322cb521790cf7a592aafa3e378449037d1b30
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Caolán McNamara

 source/text/shared/optionen/01060800.xhp |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 76322cb521790cf7a592aafa3e378449037d1b30
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 12:46:05 2013 +0100

update help ids for calc compatibility options .ui conversion

Change-Id: I4b62c05732ccf68c763cedc40f186eeab2904ab6

diff --git a/source/text/shared/optionen/01060800.xhp 
b/source/text/shared/optionen/01060800.xhp
index 2403f9b..f79b56a 100644
--- a/source/text/shared/optionen/01060800.xhp
+++ b/source/text/shared/optionen/01060800.xhp
@@ -21,7 +21,7 @@
 
 compatibility settings;key bindings 
(Calc)
 
-
+
 Compatibility
 Defines compatibility options for %PRODUCTNAME Calc.
 
@@ -30,7 +30,7 @@
 
 Key 
bindings
 The 
following table shows what actions are associated with what key bindings for 
the two key binding types (Default and OpenOffice.org 
legacy):
-
+
 

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

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

2013-06-06 Thread Caolán McNamara

 sc/uiconfig/scalc/ui/optcompatibilitypage.ui |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit a8b499c938208653cfadbc749201121c520ddb64
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 12:52:15 2013 +0100

use autowrap rather than a manual wrap for long string

really need to get that height for width working

Change-Id: I1c8b0675c671464e49c0780b0d02fd4377cd18d1

diff --git a/sc/uiconfig/scalc/ui/optcompatibilitypage.ui 
b/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
index 902ada4..2f4b60c 100644
--- a/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
+++ b/sc/uiconfig/scalc/ui/optcompatibilitypage.ui
@@ -1,7 +1,6 @@
 
 
   
-  
   
 True
 False
@@ -35,10 +34,12 @@
 False
 True
 0
-Select desired 
_key binding type. Changing the key binding
- type may overwrite some of the existing key 
bindings.
+0
+Select desired 
_key binding type. Changing the key binding type may overwrite some of the 
existing key bindings.
 True
+True
 keybindings
+60
   
   
 0
@@ -51,6 +52,7 @@
   
 True
 False
+center
 0
 1
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

2013-06-06 Thread bugzilla-daemon

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

Bug 60270 depends on bug 63547, which changed state.

Bug 63547 Summary: Cannot scroll horizontally using trackpad
https://bugs.freedesktop.org/show_bug.cgi?id=63547

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

-- 
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 'aoo/trunk' - svx/source

2013-06-06 Thread Pavel Janík

 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit 807d9f30b45221fbfb32a216bf7aa294e274d124
Author: Pavel JanÃk 
Date:   Thu Jun 6 11:37:59 2013 +

A2S is defined in sfx2/sidebar/Tools.hxx already.

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx 
b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index a9aa589..c357bde 100755
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -56,9 +56,6 @@ using namespace cssu;
 using ::sfx2::sidebar::Theme;
 using ::sfx2::sidebar::ControlFactory;
 
-#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
-
-
 namespace svx {namespace sidebar {
 #define DEFAULT_VALUE  0
 #define TOOLBOX_ITEM1  1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 07/c6343beaea37e8e6254e0f988e19f1eccf38ce

2013-06-06 Thread Caolán McNamara

 07/c6343beaea37e8e6254e0f988e19f1eccf38ce |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e39bed7da4581071d9d3fc75cd69abaf7cebe252
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 13:14:21 2013 +0100

Notes added by 'git notes add'

diff --git a/07/c6343beaea37e8e6254e0f988e19f1eccf38ce 
b/07/c6343beaea37e8e6254e0f988e19f1eccf38ce
new file mode 100644
index 000..c8d987c
--- /dev/null
+++ b/07/c6343beaea37e8e6254e0f988e19f1eccf38ce
@@ -0,0 +1 @@
+merged as: 9f97b3e270736284e2b189508b808711ebe46b26
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Miklos Vajna

 sw/source/core/inc/frame.hxx  |2 +-
 sw/source/core/layout/layact.cxx  |2 +-
 sw/source/core/layout/pagechg.cxx |7 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit eee32536181e415cde25ab0b9702bd8eb7db3d7b
Author: Miklos Vajna 
Date:   Thu Jun 6 13:44:13 2013 +0200

bnc#382137 SwFrm::CheckPageDescs: notify clients about deleted SwPageFrm

The problem is the following: SwLayAction::InternalAction() saves
pPage->GetPrev() as pTmp, then SwFrm::CheckPageDescs(pPage) is called,
which deletes pPage->GetPrev(). SwLayAction has no idea that pTmp got
deleted, and later passes it to unlockPositionOfObjects(), which
obviously assumes a valid pointer.

To be on the safe side, just provide a possibility to let the caller
know its pointer has been deleted.

Change-Id: Ibb4d83266b1f4b6146a12dce0d4701f1056deecd

diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index f93ae67..7d91e79 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -588,7 +588,7 @@ public:
 inline void SetFixSize( sal_Bool bNew ) { mbFixSize = bNew; }
 
 // check all pages (starting from the given) and correct them if needed
-static void CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields = 
sal_True );
+static void CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields = 
sal_True, SwPageFrm** ppPrev = 0);
 
 // might return 0, with and without const
 SwFrm   *GetNext()  { return mpNext; }
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 71659ce..37c77f4 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -562,7 +562,7 @@ void SwLayAction::InternalAction()
 SwPageFrm *pTmp = pPage->GetPrev() ?
 (SwPageFrm*)pPage->GetPrev() : pPage;
 SetCheckPages( sal_True );
-SwFrm::CheckPageDescs( pPage );
+SwFrm::CheckPageDescs( pPage, sal_True, &pTmp );
 SetCheckPages( sal_False );
 nCheckPageNum = USHRT_MAX;
 pPage = pTmp;
diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index 304bbcb..1bf4522 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1061,7 +1061,7 @@ void SwPageFrm::PrepareRegisterChg()
 |*  einfache zu bereinigen.
 |*
 |*/
-void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields )
+void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields, 
SwPageFrm** ppPrev )
 {
 OSL_ENSURE( pStart, "Keine Startpage." );
 
@@ -1136,10 +1136,15 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool 
bNotifyFields )
 {
 SwPageFrm *pTmp = (SwPageFrm*)pPage->GetNext();
 pPage->Cut();
+bool bUpdatePrev = false;
+if (ppPrev && *ppPrev == pPage)
+bUpdatePrev = true;
 delete pPage;
 if ( pStart == pPage )
 pStart = pTmp;
 pPage = pTmp;
+if (bUpdatePrev)
+*ppPrev = pTmp;
 continue;
 }
 else if ( pPage->IsEmptyPage() && !pFmtWish &&  //2.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: odk/examples

2013-06-06 Thread Ariel Constenla-Haile

 
odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f97b3e270736284e2b189508b808711ebe46b26
Author: Ariel Constenla-Haile 
Date:   Thu Jun 6 03:23:59 2013 +

Fix breaker when compiled with DEBUG=yes

(cherry picked from commit 07c6343beaea37e8e6254e0f988e19f1eccf38ce)

Conflicts:

odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx

Change-Id: I75278282efc80f3e9c31c413842392030beeb265

diff --git 
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
 
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
index 5cfe660..321bcf0 100644
--- 
a/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
+++ 
b/odk/examples/DevelopersGuide/OfficeDev/FilterDevelopment/FlatXmlFilter_cpp/FlatXml.cxx
@@ -178,7 +178,7 @@ sal_Bool XFlatXml::importer(
 catch( Exception &exc)
 {
 // something went wrong
-OSL_FAIL(exc.Message);
+
OSL_FAIL(rtl::OUStringToOString(exc.Message,RTL_TEXTENCODING_UTF8).getStr());
 return sal_False;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - e0/13ffd6113384a9508f3eef701413c0dae6d170

2013-06-06 Thread Caolán McNamara

 e0/13ffd6113384a9508f3eef701413c0dae6d170 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a4422c4dc425d2d704b8323cc58ae7f617face2d
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 13:15:32 2013 +0100

Notes added by 'git notes add'

diff --git a/e0/13ffd6113384a9508f3eef701413c0dae6d170 
b/e0/13ffd6113384a9508f3eef701413c0dae6d170
new file mode 100644
index 000..af23f2d
--- /dev/null
+++ b/e0/13ffd6113384a9508f3eef701413c0dae6d170
@@ -0,0 +1 @@
+prefer: bf212ec14694e74b0e8e216df50026443f4ace23
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 80/7d9f30b45221fbfb32a216bf7aa294e274d124

2013-06-06 Thread Caolán McNamara

 80/7d9f30b45221fbfb32a216bf7aa294e274d124 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 64bdd00338aa84137dff0d9ba5290d95706aa219
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 13:15:54 2013 +0100

Notes added by 'git notes add'

diff --git a/80/7d9f30b45221fbfb32a216bf7aa294e274d124 
b/80/7d9f30b45221fbfb32a216bf7aa294e274d124
new file mode 100644
index 000..8ebbe55
--- /dev/null
+++ b/80/7d9f30b45221fbfb32a216bf7aa294e274d124
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Caolán McNamara

 framework/source/dispatch/dispatchprovider.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7d257ffb1365aec5a2fa798bee832400b9d41ad3
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 13:33:27 2013 +0100

misleading comment, beamer section, not removed helpagent section

Change-Id: I1e4eb58809e471e9138895e7bb2e940a0299c1e9

diff --git a/framework/source/dispatch/dispatchprovider.cxx 
b/framework/source/dispatch/dispatchprovider.cxx
index 73bbf07..683843a 100644
--- a/framework/source/dispatch/dispatchprovider.cxx
+++ b/framework/source/dispatch/dispatchprovider.cxx
@@ -318,7 +318,7 @@ css::uno::Reference< css::frame::XDispatch > 
DispatchProvider::implts_queryFrame
 }
 
 
//-
-// I.IV) "_helpagent"
+// I.IV) "_beamer"
 //  Special sub frame of a top frame only. Search or create it. ... OK 
it's currently a little bit HACKI.
 //  Only the sfx (means the controller) can create it it.
 
//-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 53/0ebb37083ae23e93625aab8f752649696852cd

2013-06-06 Thread Caolán McNamara

 53/0ebb37083ae23e93625aab8f752649696852cd |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 8b0125ef43e3307ce3cc6afe06e2d79b2b21e0db
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 13:34:56 2013 +0100

Notes added by 'git notes add'

diff --git a/53/0ebb37083ae23e93625aab8f752649696852cd 
b/53/0ebb37083ae23e93625aab8f752649696852cd
new file mode 100644
index 000..dbca6ef
--- /dev/null
+++ b/53/0ebb37083ae23e93625aab8f752649696852cd
@@ -0,0 +1 @@
+prefer: 66714f1888eaccef4eb5341971278ae7dfafa16b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Repository.mk scp2/AutoInstallLibs_base.mk scp2/InstallModule_base.mk scp2/Module_scp2.mk scp2/source solenv/gbuild

2013-06-06 Thread Marcos Paulo de Souza

 Repository.mk|9 ++---
 scp2/AutoInstallLibs_base.mk |   12 
 scp2/InstallModule_base.mk   |2 ++
 scp2/Module_scp2.mk  |1 +
 scp2/source/base/file_base.scp   |3 ---
 scp2/source/base/module_base.scp |7 +++
 solenv/gbuild/Helper.mk  |2 +-
 7 files changed, 25 insertions(+), 11 deletions(-)

New commits:
commit 53070b048afcc7eaf1dbe79eecadb4045e65c342
Author: Marcos Paulo de Souza 
Date:   Tue Jun 4 13:41:12 2013 -0300

fdo#60924 autoinstall - gbuild/scp2: add base module

Change-Id: Iee1000ff245c369446a9e671a3f7c637f76f989b
Reviewed-on: https://gerrit.libreoffice.org/4153
Reviewed-by: MatÃºÅ¡ Kukan 
Tested-by: MatÃºÅ¡ Kukan 

diff --git a/Repository.mk b/Repository.mk
index b8f953e..ddbb17c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -210,6 +210,12 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, 
\
 
 endif
 
+$(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,BASE, \
+abp \
+dbp \
+dbu \
+))
+
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,GRAPHICFILTER, \
 svgfilter \
 flash \
@@ -376,7 +382,6 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,WRITER, \
 ))
 
 $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
-abp \
 acc \
adabas \
adabasui \
@@ -395,8 +400,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 AppleRemote \
 avmediaQuickTime \
 calc \
-dbp \
-dbu \
filtertracer \
 log \
MacOSXSpell \
diff --git a/scp2/AutoInstallLibs_base.mk b/scp2/AutoInstallLibs_base.mk
new file mode 100644
index 000..5cb70c2
--- /dev/null
+++ b/scp2/AutoInstallLibs_base.mk
@@ -0,0 +1,12 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call 
gb_AutoInstallLibs_AutoInstallLibs,base,BASE,LIBO_LIB_FILE,auto_Base_Lib))
+
+# vim: set noet sw=4 ts=4:
diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk
index e3609f4..d956142 100644
--- a/scp2/InstallModule_base.mk
+++ b/scp2/InstallModule_base.mk
@@ -9,6 +9,8 @@
 
 $(eval $(call gb_InstallModule_InstallModule,scp2/base))
 
+$(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,base))
+
 # Not sure about that?
 #$(eval $(call gb_InstallModule_define_if_set,scp2/base,\
 #  ENABLE_REPORTBUILDER \
diff --git a/scp2/Module_scp2.mk b/scp2/Module_scp2.mk
index 3178920..ce1fb02 100644
--- a/scp2/Module_scp2.mk
+++ b/scp2/Module_scp2.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_Module_Module,scp2))
 
 $(eval $(call gb_Module_add_targets,scp2,\
+   AutoInstallLibs_base \
AutoInstallLibs_onlineupdate \
AutoInstallLibs_graphicfilter \
AutoInstallLibs_tde \
diff --git a/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index f4eaad9..c111056 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -36,13 +36,10 @@ File gid_File_Exe_Odbcconfig
 End
 #endif
 
-STD_LIB_FILE( gid_File_Lib_Abp, abp)
 STD_RES_FILE( gid_File_Res_Abp, abp)
 
-STD_LIB_FILE( gid_File_Lib_Dbp, dbp)
 STD_RES_FILE( gid_File_Res_Dbp, dbp)
 
-STD_LIB_FILE( gid_File_Lib_Dbu, dbu )
 STD_RES_FILE( gid_File_Res_Dbu, dbu)
 
 STD_RES_FILE( gid_File_Res_Cnr, cnr)
diff --git a/scp2/source/base/module_base.scp b/scp2/source/base/module_base.scp
index ce28fae..615cbdd 100644
--- a/scp2/source/base/module_base.scp
+++ b/scp2/source/base/module_base.scp
@@ -18,6 +18,8 @@
 
 #include "macros.inc"
 
+#include "AutoInstallLibs/base"
+
 Module gid_Module_Prg_Base
 MOD_NAME_DESC(MODULE_PRG_BASE);
 ParentID = gid_Module_Prg;
@@ -33,11 +35,8 @@ Module gid_Module_Prg_Base_Bin
 Minimal = NO;
 Default = YES;
 Styles = (HIDDEN_ROOT);
-Files = (
+Files = (auto_Base_Lib_ALL
 gid_File_Share_Registry_Base_Xcd
-,gid_File_Lib_Abp
-,gid_File_Lib_Dbp
-,gid_File_Lib_Dbu
 );
 End
 
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index db3a859..530524c 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -109,7 +109,7 @@ endef
 define gb_Helper_init_registries
 gb_Executable_VALIDGROUPS := UREBIN SDK OOO NONE
 gb_Library_VALIDGROUPS := OOOLIBS PLAINLIBS_NONE PLAINLIBS_URE PLAINLIBS_OOO 
RTVERLIBS UNOLIBS_URE UNOVERLIBS EXTENSIONLIBS
-gb_Library_VALIDINSTALLMODULES := ONLINEUPDATE GRAPHICFILTER GNOME TDE KDE 
MATH OOO URE WRITER
+gb_Library_VALIDINSTALLMODULES := BASE ONLINEUPDATE GRAPHICFILTER GNOME TDE 
KDE MATH OOO URE WRITER
 gb_StaticLibrary_VALIDGROUPS := PLAINLIBS
 gb_Jar_VALIDGROUPS := URE OOO OXT NONE
 
___
Libreoffice-commits mailing list
libreoffice-comm.

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

2013-06-06 Thread Isamu Mogi

 sal/osl/w32/file_url.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6d2e3bdac27ade56031d930c85e906c0d35877bc
Author: Isamu Mogi 
Date:   Tue Jun 4 13:10:44 2013 +

fdo#41226 Add error handling of recursed GetCaseCorrectPathNameEx()

GetCaseCorrectPathNameEx() with bCheckExistence = true doesn't support 
windows
share path but occasionally it doesn't return failure and returns broken 
result.
For example, when we call with "\\USER-PC\Users\foo" then it converts the 
path
to "\Users\foo". And when "\Users\foo" exists, it returns "\Users\foo". It 
is
caused by missing error handling of searching for file "\\USER-PC". Also 
similar
bug possibly occurs even for local file path. This commit fixes these bugs.

Change-Id: Idf1dd1282510d8a6810ed239a83051bb0f8e2f87
Reviewed-on: https://gerrit.libreoffice.org/4151
Reviewed-by: LuboÅ¡ LuÅÃ¡k 
Tested-by: LuboÅ¡ LuÅÃ¡k 

diff --git a/sal/osl/w32/file_url.cxx b/sal/osl/w32/file_url.cxx
index fb1fa45..e9be895 100644
--- a/sal/osl/w32/file_url.cxx
+++ b/sal/osl/w32/file_url.cxx
@@ -486,7 +486,8 @@ static DWORD GetCaseCorrectPathNameEx(
 else
 bSkipThis = FALSE;
 
-GetCaseCorrectPathNameEx( lpszPath, cchBuffer, nSkipLevels, 
bCheckExistence );
+if ( !GetCaseCorrectPathNameEx( lpszPath, cchBuffer, nSkipLevels, 
bCheckExistence ) )
+return 0;
 
 PathAddBackslash( lpszPath, cchBuffer );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Michael Stahl

 sw/source/ui/envelp/mailmrge.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 61ab0ca621898afa817c92c4d13229fa943dfba8
Author: Michael Stahl 
Date:   Thu Jun 6 15:05:54 2013 +0200

fdo#64283: SwMailMergeDlg: add back missing initialize

(regression from b248624126c271c88381d3dad6e04fc954f65779)

Change-Id: I0ed8c4ec91a095babccd089c7fe4508d123ba86d

diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 077ad27..4937fe1 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -269,6 +269,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& 
rShell,
 {
 // create a frame wrapper for myself
 m_xFrame = frame::Frame::create( 
comphelper::getProcessComponentContext() );
+m_xFrame->initialize( VCLUnoHelper::GetInterface ( pBeamerWin ) );
 }
 catch (const Exception&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Michael Stahl

 sw/source/ui/envelp/mailmrge.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7a62dba0ba4915e4029a3eb4d41311489d73c933
Author: Michael Stahl 
Date:   Thu Jun 6 15:05:54 2013 +0200

fdo#64283: SwMailMergeDlg: add back missing initialize

(regression from b248624126c271c88381d3dad6e04fc954f65779)

Change-Id: I0ed8c4ec91a095babccd089c7fe4508d123ba86d
(cherry picked from commit 61ab0ca621898afa817c92c4d13229fa943dfba8)

diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 077ad27..4937fe1 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -269,6 +269,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& 
rShell,
 {
 // create a frame wrapper for myself
 m_xFrame = frame::Frame::create( 
comphelper::getProcessComponentContext() );
+m_xFrame->initialize( VCLUnoHelper::GetInterface ( pBeamerWin ) );
 }
 catch (const Exception&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Chr . Rossmanith

 sd/source/ui/slideshow/showwin.cxx |4 +-
 sd/source/ui/unoidl/sddetect.cxx   |2 -
 sd/source/ui/unoidl/unomodel.cxx   |   54 -
 sd/source/ui/unoidl/unopage.cxx|   12 +++
 sd/source/ui/view/DocumentRenderer.cxx |2 -
 sd/source/ui/view/ViewClipboard.cxx|2 -
 sd/source/ui/view/drawview.cxx |2 -
 sd/source/ui/view/outlnvsh.cxx |2 -
 sd/source/ui/view/unmodpg.cxx  |4 +-
 sd/source/ui/view/viewshel.cxx |2 -
 10 files changed, 43 insertions(+), 43 deletions(-)

New commits:
commit 47cc957c36eceb4ae035006137223b5afb652696
Author: Chr. Rossmanith 
Date:   Wed Jun 5 21:52:36 2013 +0200

Remove RTL_CONSTASCII_(U)STRINGPARAM (sd)

Change-Id: Ie936ffa0ca8e97893251ef99784a257815526957
Reviewed-on: https://gerrit.libreoffice.org/4170
Reviewed-by: LuboÅ¡ LuÅÃ¡k 
Tested-by: LuboÅ¡ LuÅÃ¡k 

diff --git a/sd/source/ui/slideshow/showwin.cxx 
b/sd/source/ui/slideshow/showwin.cxx
index 81b624d..e3f34b1 100644
--- a/sd/source/ui/slideshow/showwin.cxx
+++ b/sd/source/ui/slideshow/showwin.cxx
@@ -555,9 +555,9 @@ void ShowWindow::DrawPauseScene( bool bTimeoutOnly )
 SvtSysLocaleaSysLocale;
 const LocaleDataWrapper&aLocaleData = 
aSysLocale.GetLocaleData();
 
-aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " ( " ));
+aText.AppendAscii( " ( " );
 aText += aLocaleData.getDuration( Time( 0, 0, mnPauseTimeout ) );
-aText.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " )" ));
+aText.AppendAscii( " )" );
 aVDev.DrawText( Point( aOffset.Width(), 0 ), aText );
 DrawOutDev( Point( aOutOrg.X(), aOffset.Height() ), aVDevSize, 
Point(), aVDevSize, aVDev );
 bDrawn = true;
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index b598093..ac1f7d9 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -141,7 +141,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence< 
beans::PropertyValue >& lDes
 lDescriptor[nProperty].Value >>= sTemp;
 aURL = sTemp;
 }
-else if( !aURL.Len() && 
lDescriptor[nProperty].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("FileName"))
 )
+else if( !aURL.Len() && lDescriptor[nProperty].Name == "FileName" )
 {
 lDescriptor[nProperty].Value >>= sTemp;
 aURL = sTemp;
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 4d4746e..62c6d00 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -821,59 +821,59 @@ uno::Reference< uno::XInterface > SAL_CALL 
SdXImpressDocument::createInstance( c
 if( NULL == mpDoc )
 throw lang::DisposedException();
 
-if( 0 == aServiceSpecifier.reverseCompareToAsciiL( 
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.DashTable") ) )
+if( 0 == aServiceSpecifier.reverseCompareTo( 
"com.sun.star.drawing.DashTable" ) )
 {
 if( !mxDashTable.is() )
 mxDashTable = SvxUnoDashTable_createInstance( mpDoc );
 
 return mxDashTable;
 }
-if( 0 == aServiceSpecifier.reverseCompareToAsciiL( 
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.GradientTable") ) )
+if( 0 == aServiceSpecifier.reverseCompareTo( 
"com.sun.star.drawing.GradientTable" ) )
 {
 if( !mxGradientTable.is() )
 mxGradientTable = SvxUnoGradientTable_createInstance( mpDoc );
 
 return mxGradientTable;
 }
-if( 0 == aServiceSpecifier.reverseCompareToAsciiL( 
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.HatchTable") ) )
+if( 0 == aServiceSpecifier.reverseCompareTo( 
"com.sun.star.drawing.HatchTable" ) )
 {
 if( !mxHatchTable.is() )
 mxHatchTable = SvxUnoHatchTable_createInstance( mpDoc );
 
 return mxHatchTable;
 }
-if( 0 == aServiceSpecifier.reverseCompareToAsciiL( 
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.BitmapTable") ) )
+if( 0 == aServiceSpecifier.reverseCompareTo( 
"com.sun.star.drawing.BitmapTable" ) )
 {
 if( !mxBitmapTable.is() )
 mxBitmapTable = SvxUnoBitmapTable_createInstance( mpDoc );
 
 return mxBitmapTable;
 }
-if( 0 == aServiceSpecifier.reverseCompareToAsciiL( 
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.TransparencyGradientTable") ) )
+if( 0 == aServiceSpecifier.reverseCompareTo( 
"com.sun.star.drawing.TransparencyGradientTable" ) )
 {
 if( !mxTransGradientTable.is() )
 mxTransGradientTable = SvxUnoTransGradientTable_createInstance( 
mpDoc );
 
 return mxTransGradientTable;
 }
-if( 0 == aServiceSpecifier.reverseCompareToAsciiL( 
RTL_CONSTASCII_STRINGPARAM("com.sun.star.drawing.MarkerTable") ) )
+if( 0 == aServiceSpecifier.reverseCompareTo( 
"com.sun.star.drawing.MarkerTable" ) )
 {
 if(

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

2013-06-06 Thread Stephan Bergmann

 cppuhelper/source/defaultbootstrap.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 0f7b717a7cd42506f2915ad0aa24e4fb926a9d51
Author: Stephan Bergmann 
Date:   Thu Jun 6 10:10:21 2013 +0200

rhbz#908819: Don't call code in UNO object ctor that throws UNO exceptions

...with Context set to this, that leads to refcounting bugs.  This is a 
backport
of the relevant parts of 4e42ce3271154904b7478b9ed5e6e6856b9235c2 "Don't 
call
code in UNO object ctor that throws UNO exceptions."

Change-Id: Ie6fdf92fdf537b752cd05ed69c3b59f2c7795e28
Reviewed-on: https://gerrit.libreoffice.org/4172
Reviewed-by: LuboÅ¡ LuÅÃ¡k 
Tested-by: LuboÅ¡ LuÅÃ¡k 

diff --git a/cppuhelper/source/defaultbootstrap.cxx 
b/cppuhelper/source/defaultbootstrap.cxx
index 1fe1aa7..c61c2b0 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -589,13 +589,13 @@ class ServiceManager:
 private osl::Mutex, public ServiceManagerBase, private boost::noncopyable
 {
 public:
-explicit ServiceManager(rtl::OUString const & rdbUris):
-ServiceManagerBase(*static_cast< osl::Mutex * >(this))
-{ readRdbs(rdbUris); }
+ServiceManager(): ServiceManagerBase(*static_cast< osl::Mutex * >(this)) {}
 
 using ServiceManagerBase::acquire;
 using ServiceManagerBase::release;
 
+void init(rtl::OUString const & rdbUris) { readRdbs(rdbUris); }
+
 void setContext(
 css::uno::Reference< css::uno::XComponentContext > const & context)
 {
@@ -1985,7 +1985,8 @@ css::uno::Reference< css::uno::XComponentContext > 
bootstrapComponentContext(
 css::uno::Reference< css::registry::XSimpleRegistry > const & typeRegistry,
 rtl::OUString const & serviceUris, rtl::Bootstrap const & bootstrap)
 {
-rtl::Reference< ServiceManager > smgr(new ServiceManager(serviceUris));
+rtl::Reference< ServiceManager > smgr(new ServiceManager);
+smgr->init(serviceUris);
 cppu::ContextEntry_Init entry;
 std::vector< cppu::ContextEntry_Init > context_values;
 context_values.push_back(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - cppuhelper/source

2013-06-06 Thread Stephan Bergmann

 cppuhelper/source/defaultbootstrap.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 1e07c17c15e814393603bc2bc448ec7e7a57c341
Author: Stephan Bergmann 
Date:   Thu Jun 6 10:10:21 2013 +0200

rhbz#908819: Don't call code in UNO object ctor that throws UNO exceptions

...with Context set to this, that leads to refcounting bugs.  This is a 
backport
of the relevant parts of 4e42ce3271154904b7478b9ed5e6e6856b9235c2 "Don't 
call
code in UNO object ctor that throws UNO exceptions."

Change-Id: Ie6fdf92fdf537b752cd05ed69c3b59f2c7795e28
Reviewed-on: https://gerrit.libreoffice.org/4173
Reviewed-by: LuboÅ¡ LuÅÃ¡k 
Tested-by: LuboÅ¡ LuÅÃ¡k 

diff --git a/cppuhelper/source/defaultbootstrap.cxx 
b/cppuhelper/source/defaultbootstrap.cxx
index 7fd1e4a..e027564 100644
--- a/cppuhelper/source/defaultbootstrap.cxx
+++ b/cppuhelper/source/defaultbootstrap.cxx
@@ -590,13 +590,13 @@ class ServiceManager:
 private osl::Mutex, public ServiceManagerBase, private boost::noncopyable
 {
 public:
-explicit ServiceManager(rtl::OUString const & rdbUris):
-ServiceManagerBase(*static_cast< osl::Mutex * >(this))
-{ readRdbs(rdbUris); }
+ServiceManager(): ServiceManagerBase(*static_cast< osl::Mutex * >(this)) {}
 
 using ServiceManagerBase::acquire;
 using ServiceManagerBase::release;
 
+void init(rtl::OUString const & rdbUris) { readRdbs(rdbUris); }
+
 void setContext(
 css::uno::Reference< css::uno::XComponentContext > const & context)
 {
@@ -1996,7 +1996,8 @@ css::uno::Reference< css::uno::XComponentContext > 
bootstrapComponentContext(
 css::uno::Reference< css::registry::XSimpleRegistry > const & typeRegistry,
 rtl::OUString const & serviceUris, rtl::Bootstrap const & bootstrap)
 {
-rtl::Reference< ServiceManager > smgr(new ServiceManager(serviceUris));
+rtl::Reference< ServiceManager > smgr(new ServiceManager);
+smgr->init(serviceUris);
 cppu::ContextEntry_Init entry;
 std::vector< cppu::ContextEntry_Init > context_values;
 context_values.push_back(
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Markus Mohrhard

 sc/source/filter/xml/xmlrowi.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2e5b6fd2d1c1b23eef3c3bfb0efd7a27d21d
Author: Markus Mohrhard 
Date:   Mon Jun 3 04:49:12 2013 +0200

correct fix for fdo#62938

Change-Id: I8569e4e120a6fd2b626db0bdaadf5d9234d09a36
Reviewed-on: https://gerrit.libreoffice.org/4138
Reviewed-by: Kohei Yoshida 
Tested-by: Kohei Yoshida 

diff --git a/sc/source/filter/xml/xmlrowi.cxx b/sc/source/filter/xml/xmlrowi.cxx
index ec4c5a5..e250d6c 100644
--- a/sc/source/filter/xml/xmlrowi.cxx
+++ b/sc/source/filter/xml/xmlrowi.cxx
@@ -231,7 +231,8 @@ ScXMLTableRowsContext::ScXMLTableRowsContext( ScXMLImport& 
rImport,
 // don't have any attributes
 if (bHeader)
 {
-nHeaderStartRow = rImport.GetTables().GetCurrentRow();
+ScAddress aAddr = rImport.GetTables().GetCurrentCellPos();
+nHeaderStartRow = aAddr.Row();
 ++nHeaderStartRow;
 }
 else if (bGroup)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - include/rtl sal/qa sal/rtl

2013-06-06 Thread Stephan Bergmann

 include/rtl/string.hxx|6 ++
 include/rtl/ustring.hxx   |6 ++
 sal/qa/rtl/strings/test_strings_toint.cxx |4 
 sal/rtl/strtmpl.cxx   |   24 
 4 files changed, 4 insertions(+), 36 deletions(-)

New commits:
commit 9bf6c83367cedb7be81bf67f30d2147d26c7a8c3
Author: Stephan Bergmann 
Date:   Thu Jun 6 15:30:14 2013 +0200

Revert overflow checks in O[U]String::toInt{32,64} again

...originally introduced with bd60d41176da540b01d7583cfe00637431967f39 
"Handle
oveflow in O(U)String::toInt() functions."  As pointed out by Noel Power, 
there
is existing code using toInt32(16) to read an effectively unsigned hex 
string
into a sal_Int32, which used to work fine with the wrap-around overflow but 
now
fails when toInt32 explicitly returns 0 for large values.  See, e.g., use of
oox::AttributeList::getIntegerHex (indirectly calling OUString::toInt32) in
ColorScaleRule::importColor (sc/source/filter/oox/condformatbuffer.cxx).

To prevent any regressions in LO 4.1, remove the explicit checks from
toInt{32,64} again for now.  (They were "merely" added as a general safety
measure, not to address some specific problem, IIRC.)  On master, the 
approach
will rather be to introduce toUInt32 and adapt client code as necessary.

Change-Id: Id332cff18a99b8bd2dcccd7988b7aad3a9e98c4c

diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index c834450..7228fe7 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -1336,8 +1336,7 @@ public:
 
   @paramradix   the radix (between 2 and 36)
   @return   the int32 represented from this string.
-0 if this string represents no number or one of too large
-magnitude.
+0 if this string represents no number.
 */
 sal_Int32 toInt32( sal_Int16 radix = 10 ) const SAL_THROW(())
 {
@@ -1351,8 +1350,7 @@ public:
 
   @paramradix   the radix (between 2 and 36)
   @return   the int64 represented from this string.
-0 if this string represents no number or one of too large
-magnitude.
+0 if this string represents no number.
 */
 sal_Int64 toInt64( sal_Int16 radix = 10 ) const SAL_THROW(())
 {
diff --git a/include/rtl/ustring.hxx b/include/rtl/ustring.hxx
index da5b909..06ba97b 100644
--- a/include/rtl/ustring.hxx
+++ b/include/rtl/ustring.hxx
@@ -1799,8 +1799,7 @@ public:
 
   @paramradix   the radix (between 2 and 36)
   @return   the int32 represented from this string.
-0 if this string represents no number or one of too large
-magnitude.
+0 if this string represents no number.
 */
 sal_Int32 toInt32( sal_Int16 radix = 10 ) const SAL_THROW(())
 {
@@ -1814,8 +1813,7 @@ public:
 
   @paramradix   the radix (between 2 and 36)
   @return   the int64 represented from this string.
-0 if this string represents no number or one of too large
-magnitude.
+0 if this string represents no number.
 */
 sal_Int64 toInt64( sal_Int16 radix = 10 ) const SAL_THROW(())
 {
diff --git a/sal/qa/rtl/strings/test_strings_toint.cxx 
b/sal/qa/rtl/strings/test_strings_toint.cxx
index 4a4f549..102d30e 100644
--- a/sal/qa/rtl/strings/test_strings_toint.cxx
+++ b/sal/qa/rtl/strings/test_strings_toint.cxx
@@ -27,16 +27,13 @@ private:
 CPPUNIT_TEST_SUITE_END();
 
 void testToInt32Overflow() {
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), T("-2147483649").toInt32());
 CPPUNIT_ASSERT_EQUAL(SAL_MIN_INT32, T("-2147483648").toInt32());
 CPPUNIT_ASSERT_EQUAL(SAL_MIN_INT32 + 1, T("-2147483647").toInt32());
 CPPUNIT_ASSERT_EQUAL(SAL_MAX_INT32 - 1, T("2147483646").toInt32());
 CPPUNIT_ASSERT_EQUAL(SAL_MAX_INT32, T("2147483647").toInt32());
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), T("2147483648").toInt32());
 }
 
 void testToInt64Overflow() {
-CPPUNIT_ASSERT_EQUAL(sal_Int64(0), 
T("-9223372036854775809").toInt64());
 CPPUNIT_ASSERT_EQUAL(
 SAL_MIN_INT64, T("-9223372036854775808").toInt64());
 CPPUNIT_ASSERT_EQUAL(
@@ -44,7 +41,6 @@ private:
 CPPUNIT_ASSERT_EQUAL(
 SAL_MAX_INT64 - 1, T("9223372036854775806").toInt64());
 CPPUNIT_ASSERT_EQUAL(SAL_MAX_INT64, 
T("9223372036854775807").toInt64());
-CPPUNIT_ASSERT_EQUAL(sal_Int64(0), T("9223372036854775808").toInt64());
 }
 
 void testToUInt64Overflow() {
diff --git a/sal/rtl/strtmpl.cxx b/sal/rtl/strtmpl.cxx
index 78aa1f5..dd1effc 100644
--- a/sal/rtl/strtmpl.cxx
+++ b/sal/rtl/strtmpl.cxx
@@ -941,35 +941,11 @@ namespace {
 bNeg = sal_False;
 }
 
-T nDiv;
-sal_Int16 nMod;
-if ( bNeg )
-{
-nDiv = std::numeric_limits::min() / nRad

[Libreoffice-commits] core.git: basic/source cui/source dtrans/source editeng/source extensions/source fpicker/source libxmlsec/ExternalProject_xmlsec.mk sfx2/source svtools/source svx/source toolkit/

2013-06-06 Thread Fridrich Štrba

 basic/source/runtime/dllmgr-x64.cxx  |7 +++
 cui/source/options/optsave.cxx   |   12 ++--
 cui/source/tabpages/autocdlg.cxx |4 ++--
 cui/source/tabpages/measure.cxx  |8 
 cui/source/tabpages/numpages.cxx |4 ++--
 dtrans/source/win32/misc/ImplHelper.cxx  |7 ---
 editeng/source/misc/svxacorr.cxx |2 +-
 extensions/source/plugin/win/sysplug.cxx |8 
 extensions/source/scanner/scanwin.cxx|   10 +-
 fpicker/source/win32/filepicker/FileOpenDlg.cxx  |2 +-
 fpicker/source/win32/filepicker/dibpreview.cxx   |2 +-
 libxmlsec/ExternalProject_xmlsec.mk  |1 +
 sfx2/source/appl/shutdowniconw32.cxx |2 +-
 sfx2/source/dialog/dinfdlg.cxx   |6 +++---
 svtools/source/contnr/treelistbox.cxx|2 +-
 svtools/source/control/ctrlbox.cxx   |4 ++--
 svx/source/sidebar/line/LineWidthControl.cxx |2 +-
 svx/source/svdraw/svdhdl.cxx |6 +++---
 svx/source/svdraw/svdmark.cxx|2 +-
 svx/source/svdraw/svdograf.cxx   |2 +-
 toolkit/source/awt/vclxsystemdependentwindow.cxx |2 +-
 toolkit/source/awt/vclxtopwindow.cxx |2 +-
 22 files changed, 49 insertions(+), 48 deletions(-)

New commits:
commit 35a65baefe99181685aea8e630d27c5e2a7c6bc4
Author: Fridrich Å trba 
Date:   Thu Jun 6 15:50:51 2013 +0200

Slowly, but surely going on compiling for mingw64

Change-Id: I590aa6a854a040281bf73d5be768c05d4906a984

diff --git a/basic/source/runtime/dllmgr-x64.cxx 
b/basic/source/runtime/dllmgr-x64.cxx
index 0595d85..1575226 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -43,7 +43,6 @@
 #include "dllmgr.hxx"
 
 using namespace css;
-using namespace css::uno;
 
 /* Open issues:
 
@@ -495,8 +494,8 @@ SbError call(
 sal_Int32 (*proc_i)(double d, ...) = (sal_Int32 (*)(double, ...)) 
proc.proc;
 double (*proc_d)(double d, ...) = (double (*)(double, ...)) proc.proc;
 
-sal_Int64 iRetVal;
-double dRetVal;
+sal_Int64 iRetVal = 0;
+double dRetVal = 0.0;
 
 switch (result.GetType()) {
 case SbxEMPTY:
@@ -712,7 +711,7 @@ OUString fullDllName(OUString const & name) {
 
 struct SbiDllMgr::Impl: private boost::noncopyable {
 private:
-typedef std::map< OUString, Reference< Dll > > Dlls;
+typedef std::map< OUString, ::rtl::Reference< Dll > > Dlls;
 
 public:
 Dll * getDll(OUString const & name);
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 24e8a08..54ae41a 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -253,7 +253,7 @@ sal_Bool SfxSaveTabPage::FillItemSet( SfxItemSet& rSet )
 
 if ( aODFVersionLB->GetSelectEntryPos() != aODFVersionLB->GetSavedValue() )
 {
-long nVersion = long( aODFVersionLB->GetEntryData( 
aODFVersionLB->GetSelectEntryPos() ) );
+sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetEntryData( 
aODFVersionLB->GetSelectEntryPos() ) );
 aSaveOpt.SetODFDefaultVersion( SvtSaveOptions::ODFDefaultVersion( 
nVersion ) );
 }
 
@@ -408,7 +408,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
 {
 for(sal_uInt16 n = 0; n < aDocTypeLB->GetEntryCount(); n++)
 {
-long nData = (long) aDocTypeLB->GetEntryData(n);
+sal_IntPtr nData = (sal_IntPtr) 
aDocTypeLB->GetEntryData(n);
 OUString sCommand;
 sCommand = "matchByDocumentService=%1:iflags=" +

OUString::number(SFX_FILTER_IMPORT|SFX_FILTER_EXPORT) +
@@ -489,7 +489,7 @@ void SfxSaveTabPage::Reset( const SfxItemSet& )
 
 aRelativeInetCB->Check( aSaveOpt.IsSaveRelINet() );
 
-void* pDefaultVersion = (void*)long( aSaveOpt.GetODFDefaultVersion() );
+void* pDefaultVersion = (void*)sal_IntPtr( aSaveOpt.GetODFDefaultVersion() 
);
 aODFVersionLB->SelectEntryPos( aODFVersionLB->GetEntryPos( pDefaultVersion 
) );
 
 AutoClickHdl_Impl( aAutoSaveCB );
@@ -554,9 +554,9 @@ IMPL_LINK( SfxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
 {
 sal_uInt16 nCurPos = aDocTypeLB->GetSelectEntryPos();
 
-long nData = -1;
+sal_IntPtr nData = -1;
 if(nCurPos < APP_COUNT)
-nData = (long) aDocTypeLB->GetEntryData(nCurPos);
+nData = (sal_IntPtr) aDocTypeLB->GetEntryData(nCurPos);
 
 if ( nData >= 0 && nData < APP_COUNT )
 {
@@ -616,7 +616,7 @@ IMPL_LINK( SfxSaveTabPage, FilterHdl_Impl, ListBox *, pBox )
 
 IMPL_LINK_NOARG(SfxSaveTabPage, ODFVersionHdl_Impl)
 {
-long nVersion = long( aODFVersionLB->GetEntryData( 
aODFVersionLB->GetSelectEntryPos() ) );
+sal_IntPtr nVersion = sal_IntPtr( aODFVersionLB->GetEntryData( 
aODFVersionLB->GetSelectEntryPos() ) );

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

2013-06-06 Thread Noel Power

 sc/source/filter/inc/stylesbuffer.hxx |2 --
 sc/source/filter/oox/stylesbuffer.cxx |   26 ++
 2 files changed, 6 insertions(+), 22 deletions(-)

New commits:
commit 7ef1a64bdb8f9afaeb93e7a88219650381e0d323
Author: Noel Power 
Date:   Wed Jun 5 16:15:53 2013 +0100

another attempt at followon patch for fdo#38385 attempt to detect rtl

First attempt confused things ( and was error prone ) by introducing
maStart and maEnd BorderLine members to BorderLine model. Better to
just leave maLeft & maRight and attempt to swap if RTL.
Of course tbh this is somewhat of an optimistic attempt to swap start and 
end borders
if needed. I am not at all sure though that I am dectecting the RTL-ness
of a cell in the correct way. There are some comments in the code in any 
case
that reflect my uncertainty ( hopefully they will be of use if/when some 
tweak
is needed )

Change-Id: Ie953d73067630f0041fa037c6120cdbda683e796

diff --git a/sc/source/filter/inc/stylesbuffer.hxx 
b/sc/source/filter/inc/stylesbuffer.hxx
index 16d5779..cbedfb3 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -513,7 +513,7 @@ public:
 voidimportDxfBorder( sal_Int32 nElement, 
SequenceInputStream& rStrm );
 
 /** Final processing after import of all style settings. */
-voidfinalizeImport();
+voidfinalizeImport( bool bRTL );
 
 /** Returns the border model structure. */
 inline const BorderModel& getModel() const { return maModel; }
diff --git a/sc/source/filter/oox/stylesbuffer.cxx 
b/sc/source/filter/oox/stylesbuffer.cxx
index 6413a16..e06f075 100644
--- a/sc/source/filter/oox/stylesbuffer.cxx
+++ b/sc/source/filter/oox/stylesbuffer.cxx
@@ -1701,8 +1701,14 @@ void Border::importDxfBorder( sal_Int32 nElement, 
SequenceInputStream& rStrm )
 }
 }
 
-void Border::finalizeImport()
+void Border::finalizeImport( bool bRTL )
 {
+if ( bRTL )
+{
+BorderLineModel aTmp = maModel.maLeft;
+maModel.maLeft = maModel.maRight;
+maModel.maRight = aTmp;
+}
 maApiData.mbBorderUsed = maModel.maLeft.mbUsed || maModel.maRight.mbUsed 
|| maModel.maTop.mbUsed || maModel.maBottom.mbUsed;
 maApiData.mbDiagUsed   = maModel.maDiagonal.mbUsed;
 
@@ -2579,13 +2585,22 @@ void Dxf::finalizeImport()
 {
 if( mxFont.get() )
 mxFont->finalizeImport();
+bool bRTL = false;
 // number format already finalized by the number formats buffer
 if( mxAlignment.get() )
+{
 mxAlignment->finalizeImport();
+// how do we detect RTL when text dir is OOX_XF_CONTEXT? ( seems you
+// would need access to the cell content, which we don't here )
+if ( mxAlignment->getModel().mnTextDir == OOX_XF_TEXTDIR_RTL )
+bRTL = true;
+}
 if( mxProtection.get() )
 mxProtection->finalizeImport();
 if( mxBorder.get() )
-mxBorder->finalizeImport();
+{
+mxBorder->finalizeImport( bRTL );
+}
 if( mxFill.get() )
 mxFill->finalizeImport();
 }
@@ -3110,7 +3125,9 @@ void StylesBuffer::finalizeImport()
 // number formats
 maNumFmts.finalizeImport();
 // borders and fills
-maBorders.forEachMem( &Border::finalizeImport );
+// is there a document wide RTL setting that we
+// would/could need to pass to finalizeImport here ?
+maBorders.forEachMem( &Border::finalizeImport, false );
 maFills.forEachMem( &Fill::finalizeImport );
 // style XFs and cell XFs
 maStyleXfs.forEachMem( &Xf::finalizeImport );
commit e8321a374366cf348b6e3731bccf4a716b5ae390
Author: Noel Power 
Date:   Wed Jun 5 16:08:36 2013 +0100

Revert "follow patch for fdo#38385 attempt to detect rtl"

This reverts commit d2cccde341af33b72378f3e7b0e8dd9ff1cd5e65.

diff --git a/sc/source/filter/inc/stylesbuffer.hxx 
b/sc/source/filter/inc/stylesbuffer.hxx
index 7108a49..16d5779 100644
--- a/sc/source/filter/inc/stylesbuffer.hxx
+++ b/sc/source/filter/inc/stylesbuffer.hxx
@@ -458,9 +458,7 @@ struct BorderLineModel
 /** Contains XML attributes of a complete cell border. */
 struct BorderModel
 {
-BorderLineModel maStart;/// Start line format.
 BorderLineModel maLeft; /// Left line format.
-BorderLineModel maEnd;  /// End line format.
 BorderLineModel maRight;/// Right line format.
 BorderLineModel maTop;  /// Top line format.
 BorderLineModel maBottom;   /// Bottom line format.
@@ -515,7 +513,7 @@ public:
 voidimportDxfBorder( sal_Int32 nElement, 
SequenceInputStream& rStrm );
 
 /** Final processing after import of all style settings. */
-voidfinalizeImport( bool bRTL );
+voidfinalizeImport();
 
 /** Returns the border model structure. */
 inline const BorderModel& getModel() co

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - vcl/aqua

2013-06-06 Thread Armin Le Grand

 vcl/aqua/source/dtrans/DataFlavorMapping.cxx |   30 +++
 vcl/aqua/source/dtrans/DataFlavorMapping.hxx |4 ---
 vcl/aqua/source/dtrans/OSXTransferable.cxx   |3 +-
 vcl/aqua/source/dtrans/aqua_clipboard.cxx|3 +-
 4 files changed, 18 insertions(+), 22 deletions(-)

New commits:
commit 11d6690fddcebec67baba285f87e647241ebfd82
Author: Armin Le Grand 
Date:   Thu Jun 6 12:10:35 2013 +

i122420 Re-activated the internal OpenOfficeToSystemFlavor

diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx 
b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
index 1669e5a..c784602 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.cxx
@@ -549,9 +549,10 @@ DataFlavor 
DataFlavorMapper::systemToOpenOfficeFlavor(NSString* systemDataFlavor
 return oOOFlavor;
 }
 
-NSString* DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor& 
oOOFlavor) const
+NSString* DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor& 
oOOFlavor, bool& rbInternal) const
 {
 NSString* sysFlavor = NULL;
+rbInternal = false;
 
 for( size_t i = 0; i < SIZE_FLAVOR_MAP; ++i )
 {
@@ -561,17 +562,16 @@ NSString* 
DataFlavorMapper::openOfficeToSystemFlavor(const DataFlavor& oOOFlavor
 }
 }
 
-return sysFlavor;
-}
+if(!sysFlavor)
+{
+rbInternal = true;
+OfficeOnlyTypes::const_iterator it = maOfficeOnlyTypes.find( 
oOOFlavor.MimeType );
 
-NSString* DataFlavorMapper::internalOpenOfficeToSystemFlavor(const DataFlavor& 
oOOFlavor) const
-{
-NSString* sysFlavor = NULL;
-OfficeOnlyTypes::const_iterator it = maOfficeOnlyTypes.find( 
oOOFlavor.MimeType );
-if( it == maOfficeOnlyTypes.end() )
-sysFlavor = maOfficeOnlyTypes[ oOOFlavor.MimeType ] = 
OUStringToNSString( oOOFlavor.MimeType );
-else
-sysFlavor = it->second;
+if( it == maOfficeOnlyTypes.end() )
+sysFlavor = maOfficeOnlyTypes[ oOOFlavor.MimeType ] = 
OUStringToNSString( oOOFlavor.MimeType );
+else
+sysFlavor = it->second;
+}
 
 return sysFlavor;
 }
@@ -697,7 +697,7 @@ NSArray* DataFlavorMapper::flavorSequenceToTypesArray(const 
com::sun::star::uno:
   sal_uInt32 nFlavors = flavors.getLength();
   NSMutableArray* array = [[NSMutableArray alloc] initWithCapacity: 1];
 
-  bool bNeedDummyInternalFlavor (true);
+  bool bNeedDummyInternalFlavor(false);
 
   for (sal_uInt32 i = 0; i < nFlavors; i++)
   {
@@ -708,11 +708,7 @@ NSArray* 
DataFlavorMapper::flavorSequenceToTypesArray(const com::sun::star::uno:
   }
   else
   {
-  NSString* str = openOfficeToSystemFlavor(flavors[i]);
-  if (str == NULL)
-  str = internalOpenOfficeToSystemFlavor(flavors[i]);
-  else
-  bNeedDummyInternalFlavor = false;
+  NSString* str = openOfficeToSystemFlavor(flavors[i], 
bNeedDummyInternalFlavor);
 
   if (str != NULL)
   {
diff --git a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx 
b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
index 296d8f0..9a9e709 100644
--- a/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
+++ b/vcl/aqua/source/dtrans/DataFlavorMapping.hxx
@@ -85,7 +85,7 @@ public:
  If there is no suiteable mapping available NULL will
  be returned.
   */
-  NSString* openOfficeToSystemFlavor(const 
com::sun::star::datatransfer::DataFlavor& oooDataFlavor) const;
+  NSString* openOfficeToSystemFlavor(const 
com::sun::star::datatransfer::DataFlavor& oooDataFlavor, bool& rbInternal) 
const;
 
   /* Select the best available image data type
  If there is no suiteable mapping available NULL will
@@ -132,8 +132,6 @@ private:
*/
   bool isValidMimeContentType(const rtl::OUString& contentType) const;
 
-  NSString* internalOpenOfficeToSystemFlavor(const 
com::sun::star::datatransfer::DataFlavor& oooDataFlavor) const;
-
 private:
   ::com::sun::star::uno::Reference< 
::com::sun::star::datatransfer::XMimeContentTypeFactory> mrXMimeCntFactory;
   typedef std::hash_map< rtl::OUString, NSString*, rtl::OUStringHash > 
OfficeOnlyTypes;
diff --git a/vcl/aqua/source/dtrans/OSXTransferable.cxx 
b/vcl/aqua/source/dtrans/OSXTransferable.cxx
index 21aadd5..9a12689 100644
--- a/vcl/aqua/source/dtrans/OSXTransferable.cxx
+++ b/vcl/aqua/source/dtrans/OSXTransferable.cxx
@@ -84,10 +84,11 @@ Any SAL_CALL OSXTransferable::getTransferData( const 
DataFlavor& aFlavor )
static_cast(this));
 }
 
+  bool bInternal(false);
   NSString* sysFormat =
   (aFlavor.MimeType.compareToAscii( "image/png", 9 ) == 0)
   ? mDataFlavorMapper->openOfficeImageToSystemFlavor( mPasteboard )
-  : mDataFlavorMapper->openOfficeToSystemFlavor(aFlavor);
+  : mDataFlavorMapper->openOfficeToSystemFlavor(aFlavor, bInternal);
   DataProviderPtr_t dp;
 
   if ([sysFormat caseInsensitiveCompare: NSFilenamesPboardType] == 
NSOrderedSame)
diff --git a/vcl/aqua/source/dtrans/aqua_cli

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 04/2c77a5b80590994864441b1aa50861b5146e88

2013-06-06 Thread Caolán McNamara

 04/2c77a5b80590994864441b1aa50861b5146e88 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c40bc528bbc92891c34172cfbad23f6d8b493e7c
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 15:09:31 2013 +0100

Notes added by 'git notes add'

diff --git a/04/2c77a5b80590994864441b1aa50861b5146e88 
b/04/2c77a5b80590994864441b1aa50861b5146e88
new file mode 100644
index 000..ea85c13
--- /dev/null
+++ b/04/2c77a5b80590994864441b1aa50861b5146e88
@@ -0,0 +1 @@
+prefer: 7df4c7feacf51c141a7beaa2a8404d932d7c2e86
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Miklos Vajna

 sw/source/filter/ww8/docxattributeoutput.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 248a63f5d0d09b6e8388192a0fe7332a624e8829
Author: Miklos Vajna 
Date:   Thu Jun 6 16:35:52 2013 +0200

bnc#382137 DocxAttributeOutput: don't store address of local variable

AttributeOutputBase::TextField() passes the address of its local
variable to WriteExpand(), and DocxAttributeOutput::WriteField_Impl()
stored this. When it was to be used, the variable already went out of
scope, resulting in a crash. Given that SwField is an abstract base
class, the easiest way is to just copy the field and manually delete it
when it's no longer needed.

Change-Id: I9d1fe2485277f1ac21a576d7ff0d05003f0ac8a1

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 5cbf3c6..bd54f5a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -564,6 +564,8 @@ void DocxAttributeOutput::EndRun()
 // Unknown fields sould be removed too
 if ( !pIt->bClose || ( pIt->eType == ww::eUNKNOWN ) )
 {
+if (pIt->pField)
+delete pIt->pField;
 pIt = m_Fields.erase( pIt );
 continue;
 }
@@ -598,6 +600,8 @@ void DocxAttributeOutput::EndRun()
 
 // Remove the field if no end needs to be written
 if ( !pIt->bClose ) {
+if (pIt->pField)
+delete pIt->pField;
 pIt = m_Fields.erase( pIt );
 continue;
 }
@@ -646,6 +650,8 @@ void DocxAttributeOutput::EndRun()
 while ( m_Fields.begin() != m_Fields.end() )
 {
 EndField_Impl( m_Fields.front( ) );
+if (m_Fields.front().pField)
+delete m_Fields.front().pField;
 m_Fields.erase( m_Fields.begin( ) );
 }
 
@@ -3921,7 +3927,8 @@ void DocxAttributeOutput::WriteExpand( const SwField* 
pFld )
 void DocxAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField 
eType, const String& rFldCmd, sal_uInt8 nMode )
 {
 struct FieldInfos infos;
-infos.pField = pFld;
+if (pFld)
+infos.pField = pFld->CopyField();
 infos.sCmd = rFldCmd;
 infos.eType = eType;
 infos.bClose = WRITEFIELD_CLOSE & nMode;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Miklos Vajna

 sw/source/filter/ww8/docxattributeoutput.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit c0129c7199b1662caf010fa556b2973196ce7b07
Author: Miklos Vajna 
Date:   Thu Jun 6 16:35:52 2013 +0200

bnc#382137 DocxAttributeOutput: don't store address of local variable

AttributeOutputBase::TextField() passes the address of its local
variable to WriteExpand(), and DocxAttributeOutput::WriteField_Impl()
stored this. When it was to be used, the variable already went out of
scope, resulting in a crash. Given that SwField is an abstract base
class, the easiest way is to just copy the field and manually delete it
when it's no longer needed.

Change-Id: I9d1fe2485277f1ac21a576d7ff0d05003f0ac8a1
(cherry picked from commit 92f328fb5eef672d379ed0b712b025eb80622d5a)

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 549ed52..66c003e 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -564,6 +564,8 @@ void DocxAttributeOutput::EndRun()
 // Unknown fields sould be removed too
 if ( !pIt->bClose || ( pIt->eType == ww::eUNKNOWN ) )
 {
+if (pIt->pField)
+delete pIt->pField;
 pIt = m_Fields.erase( pIt );
 continue;
 }
@@ -598,6 +600,8 @@ void DocxAttributeOutput::EndRun()
 
 // Remove the field if no end needs to be written
 if ( !pIt->bClose ) {
+if (pIt->pField)
+delete pIt->pField;
 pIt = m_Fields.erase( pIt );
 continue;
 }
@@ -646,6 +650,8 @@ void DocxAttributeOutput::EndRun()
 while ( m_Fields.begin() != m_Fields.end() )
 {
 EndField_Impl( m_Fields.front( ) );
+if (m_Fields.front().pField)
+delete m_Fields.front().pField;
 m_Fields.erase( m_Fields.begin( ) );
 }
 
@@ -3829,7 +3835,8 @@ void DocxAttributeOutput::WriteExpand( const SwField* 
pFld )
 void DocxAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField 
eType, const String& rFldCmd, sal_uInt8 nMode )
 {
 struct FieldInfos infos;
-infos.pField = pFld;
+if (pFld)
+infos.pField = pFld->CopyField();
 infos.sCmd = rFldCmd;
 infos.eType = eType;
 infos.bClose = WRITEFIELD_CLOSE & nMode;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Miklos Vajna

 sw/source/filter/ww8/docxattributeoutput.cxx |9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 1ab2ca73184a293e6bde95fef59695afb986748d
Author: Miklos Vajna 
Date:   Thu Jun 6 16:35:52 2013 +0200

bnc#382137 DocxAttributeOutput: don't store address of local variable

AttributeOutputBase::TextField() passes the address of its local
variable to WriteExpand(), and DocxAttributeOutput::WriteField_Impl()
stored this. When it was to be used, the variable already went out of
scope, resulting in a crash. Given that SwField is an abstract base
class, the easiest way is to just copy the field and manually delete it
when it's no longer needed.

Change-Id: I9d1fe2485277f1ac21a576d7ff0d05003f0ac8a1
(cherry picked from commit 248a63f5d0d09b6e8388192a0fe7332a624e8829)

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx 
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 27bd60f..58d6b0a 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -489,6 +489,8 @@ void DocxAttributeOutput::EndRun()
 // Unknown fields sould be removed too
 if ( !pIt->bClose || ( pIt->eType == ww::eUNKNOWN ) )
 {
+if (pIt->pField)
+delete pIt->pField;
 pIt = m_Fields.erase( pIt );
 continue;
 }
@@ -523,6 +525,8 @@ void DocxAttributeOutput::EndRun()
 
 // Remove the field if no end needs to be written
 if ( !pIt->bClose ) {
+if (pIt->pField)
+delete pIt->pField;
 pIt = m_Fields.erase( pIt );
 continue;
 }
@@ -570,6 +574,8 @@ void DocxAttributeOutput::EndRun()
 while ( m_Fields.begin() != m_Fields.end() )
 {
 EndField_Impl( m_Fields.front( ) );
+if (m_Fields.front().pField)
+delete m_Fields.front().pField;
 m_Fields.erase( m_Fields.begin( ) );
 }
 
@@ -3712,7 +3718,8 @@ void DocxAttributeOutput::WriteExpand( const SwField* 
pFld )
 void DocxAttributeOutput::WriteField_Impl( const SwField* pFld, ww::eField 
eType, const String& rFldCmd, sal_uInt8 nMode )
 {
 struct FieldInfos infos;
-infos.pField = pFld;
+if (pFld)
+infos.pField = pFld->CopyField();
 infos.sCmd = rFldCmd;
 infos.eType = eType;
 infos.bClose = WRITEFIELD_CLOSE & nMode;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Javier Fernandez

 dbaccess/source/ui/dlg/generalpage.cxx |5 +
 include/sal/log-areas.dox  |1 +
 2 files changed, 6 insertions(+)

New commits:
commit b6a91e6d30e2a15880638d570d4c7d1e6c4a1853
Author: Javier Fernandez 
Date:   Thu Jun 6 09:14:49 2013 +

Prevent out-of-range values coming from ListBox GetSelectEntryPos.

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

diff --git a/dbaccess/source/ui/dlg/generalpage.cxx 
b/dbaccess/source/ui/dlg/generalpage.cxx
index 3eea60a..0373916 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -329,6 +329,11 @@ namespace dbaui
 {
 // get the type from the entry data
 sal_Int16 nSelected = _pBox->GetSelectEntryPos();
+if (nSelected < 0 || nSelected >= m_aURLPrefixes.size() )
+{
+SAL_WARN("dbaui.OGeneralPage", "Got out-of-range value '" << 
nSelected <<  "' from the DatasourceType selection ListBox's 
GetSelectEntryPos(): " << ((nSelected < 0) ? "negative" : "no corresponding URL 
prefix") );
+return 0L;
+}
 const OUString sURLPrefix = m_aURLPrefixes[ nSelected ];
 
 setParentTitle( sURLPrefix );
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index a6d14de..8917815 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -345,6 +345,7 @@ certain functionality.
 
 @li @c dbaccess
 @li @c dbaccess.ui
+@li @c dbaccess.OGeneralPage
 
 @section svx
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Stephan Bergmann

 dbaccess/source/ui/dlg/generalpage.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit fb835e0e8a99caeb7dbb79bf6d935c97d291114c
Author: Stephan Bergmann 
Date:   Thu Jun 6 17:21:27 2013 +0200

-Werror=sign-compare

(ListBox::GetSelectEntryPos returns sal_uInt16)

Change-Id: Ia6e4bf4354523f5112ee3ade1d3da6db0f9ab2c4

diff --git a/dbaccess/source/ui/dlg/generalpage.cxx 
b/dbaccess/source/ui/dlg/generalpage.cxx
index 0373916..e2b325a 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -328,8 +328,8 @@ namespace dbaui
 IMPL_LINK( OGeneralPage, OnDatasourceTypeSelected, ListBox*, _pBox )
 {
 // get the type from the entry data
-sal_Int16 nSelected = _pBox->GetSelectEntryPos();
-if (nSelected < 0 || nSelected >= m_aURLPrefixes.size() )
+sal_uInt16 nSelected = _pBox->GetSelectEntryPos();
+if (nSelected >= m_aURLPrefixes.size() )
 {
 SAL_WARN("dbaui.OGeneralPage", "Got out-of-range value '" << 
nSelected <<  "' from the DatasourceType selection ListBox's 
GetSelectEntryPos(): " << ((nSelected < 0) ? "negative" : "no corresponding URL 
prefix") );
 return 0L;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Stephan Bergmann

 dbaccess/source/ui/dlg/generalpage.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a4c3dc55951dd54882be9eac2c8f6057fa184f07
Author: Stephan Bergmann 
Date:   Thu Jun 6 17:26:26 2013 +0200

Fix previous fix

Change-Id: I2d7ea38b743d78327fd19886019c1106bc1316d6

diff --git a/dbaccess/source/ui/dlg/generalpage.cxx 
b/dbaccess/source/ui/dlg/generalpage.cxx
index e2b325a..7179adc 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -331,7 +331,7 @@ namespace dbaui
 sal_uInt16 nSelected = _pBox->GetSelectEntryPos();
 if (nSelected >= m_aURLPrefixes.size() )
 {
-SAL_WARN("dbaui.OGeneralPage", "Got out-of-range value '" << 
nSelected <<  "' from the DatasourceType selection ListBox's 
GetSelectEntryPos(): " << ((nSelected < 0) ? "negative" : "no corresponding URL 
prefix") );
+SAL_WARN("dbaui.OGeneralPage", "Got out-of-range value '" << 
nSelected <<  "' from the DatasourceType selection ListBox's 
GetSelectEntryPos(): no corresponding URL prefix");
 return 0L;
 }
 const OUString sURLPrefix = m_aURLPrefixes[ nSelected ];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Caolán McNamara

 sw/UIConfig_swriter.mk |1 
 sw/inc/helpid.h|1 
 sw/inc/index.hrc   |1 
 sw/source/ui/index/cnttab.cxx  |  142 ++
 sw/source/ui/index/cnttab.hrc  |   15 -
 sw/source/ui/index/cnttab.src  |   80 
 sw/uiconfig/swriter/ui/createautomarkdialog.ui |  241 +
 7 files changed, 341 insertions(+), 140 deletions(-)

New commits:
commit 82ed0efee489b91037a41fc72b898582ea3e5ec4
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 11:59:14 2013 +0100

convert concordence entry dialog to .ui format

Change-Id: I52f88e6be67c4473ccf1b999ac7cb346b1c4f9ee

diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 618394b..89e6eac 100644
--- a/sw/UIConfig_swriter.mk
+++ b/sw/UIConfig_swriter.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/columnwidth \
sw/uiconfig/swriter/ui/converttexttable \
sw/uiconfig/swriter/ui/createauthorentry \
+   sw/uiconfig/swriter/ui/createautomarkdialog \
sw/uiconfig/swriter/ui/dropdownfielddialog \
sw/uiconfig/swriter/ui/endnotepage \
sw/uiconfig/swriter/ui/editcategories \
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 72dcb80..1ea0ffc 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -410,7 +410,6 @@
 #define HID_AUTH_FIELD_ISBN 
"SW_HID_AUTH_FIELD_ISBN"
 
 #define HID_INSERT_INDEX_ENTRY_LEVEL_LB 
"SW_HID_INSERT_INDEX_ENTRY_LEVEL_LB"
-#define HID_DLG_CREATE_AUTOMARK 
"SW_HID_DLG_CREATE_AUTOMARK"
 #define HID_BUSINESS_CARD_CONTENT   
"SW_HID_BUSINESS_CARD_CONTENT"
 #define HID_SAVE_LABEL_DLG  
"SW_HID_SAVE_LABEL_DLG"
 #define HID_BUSINESS_FMT_PAGE   
"SW_HID_BUSINESS_FMT_PAGE"
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index 6f3ec1e..99ec6e5 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -40,7 +40,6 @@
 
 #define  STR_FILE_NOT_FOUND (RC_INDEX_BEGIN + 18)
 #define  DLG_CHANGE_AUTH_ENTRY  (RC_INDEX_BEGIN + 19)
-#define  DLG_CREATE_AUTOMARK(RC_INDEX_BEGIN + 20)
 
 #endif  // _INDEX_HRC
 
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index bf7965e..c3fe967 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -140,6 +140,7 @@ struct AutoMarkEntry
 typedef boost::ptr_vector AutoMarkEntryArr;
 
 typedef ::svt::EditBrowseBox SwEntryBrowseBox_Base;
+
 class SwEntryBrowseBox : public SwEntryBrowseBox_Base
 {
 EditaCellEdit;
@@ -173,25 +174,25 @@ protected:
 virtual ::svt::CellController*  GetController(long nRow, sal_uInt16 nCol);
 virtual sal_BoolSaveModified();
 
+std::vector   GetOptimalColWidths() const;
+
 public:
-SwEntryBrowseBox(Window* pParent, const ResId& rId,
-   BrowserMode nMode = 0 );
+SwEntryBrowseBox(Window* pParent, VclBuilderContainer* pBuilder);
 voidReadEntries(SvStream& rInStr);
 voidWriteEntries(SvStream& rOutStr);
 
 sal_BoolIsModified()const;
 
 virtual String GetCellText( long nRow, sal_uInt16 nColumn ) const;
+virtual void Resize();
+virtual Size GetOptimalSize() const;
 };
 
 class SwAutoMarkDlg_Impl : public ModalDialog
 {
-OKButtonaOKPB;
-CancelButtonaCancelPB;
-HelpButton  aHelpPB;
+OKButton*   m_pOKPB;
 
-SwEntryBrowseBoxaEntriesBB;
-FixedLine   aEntriesFL;
+SwEntryBrowseBox*   m_pEntriesBB;
 
 String  sAutoMarkURL;
 const StringsAutoMarkType;
@@ -3879,9 +3880,8 @@ void SwTOXStylesTabPage::Modify()
 #define ITEM_WORDONLY   7
 
 
-SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, const ResId& rId,
-   BrowserMode nMode ) :
-SwEntryBrowseBox_Base( pParent, rId, nMode,
+SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, VclBuilderContainer* 
pBuilder)
+: SwEntryBrowseBox_Base( pParent, EBBF_NONE, WB_TABSTOP | WB_BORDER,
BROWSER_KEEPSELECTION |
BROWSER_COLUMNSELECTION |
BROWSER_MULTISELECTION |
@@ -3889,22 +3889,21 @@ SwEntryBrowseBox::SwEntryBrowseBox(Window* pParent, 
const ResId& rId,
BROWSER_HLINESFULL |
BROWSER_VLINESFULL |
BROWSER_AUTO_VSCROLL|
-   BROWSER_HIDECURSOR   ),
-aCellEdit(&GetDataWindow(), 0),
-aCellCheckBox(&GetDataWindow()),
-
-sSearch(ResId(ST_SEARCH, *rId.GetResMgr() )),
-sAlternative(   R

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - solenv/gbuild

2013-06-06 Thread Andras Timar

 solenv/gbuild/Gallery.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 77a45df7adf9597284cc789e63c07771e5d0e285
Author: Andras Timar 
Date:   Thu Jun 6 17:41:16 2013 +0200

fix .po file path in Gallery makefile

... which made localization actually work. I hope I did not
oversimplify a general scheme.

Change-Id: I942844fad6f869ad91b4c4134f06dd0b

diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index bf7d72c..0273b50 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -76,7 +76,7 @@ endef
 define gb_Gallery__command_ulf
 $(call gb_Output_announce,$(2),$(true),ULF,1)
 MERGEINPUT=`$(gb_MKTEMP)` && \
-echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst 
%/,%,$(dir $(GALLERY_BASEDIR))).po) > $${MERGEINPUT} && \
+echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/extras/source/gallery/share.po) 
> $${MERGEINPUT} && \
 $(call gb_Helper_abbreviate_dirs,\
$(call gb_Executable_get_command,ulfex) -i $(GALLERY_ULFFILE) -o $(1) 
-m $${MERGEINPUT} -l all) && \
 rm -rf $${MERGEINPUT}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - a5/f420bed1967c563cdd3e32ad14d2891ef59f2e

2013-06-06 Thread Caolán McNamara

 a5/f420bed1967c563cdd3e32ad14d2891ef59f2e |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 12ecfccf8ba503252f5de9235354a3c27b697313
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 16:45:18 2013 +0100

Notes added by 'git notes add'

diff --git a/a5/f420bed1967c563cdd3e32ad14d2891ef59f2e 
b/a5/f420bed1967c563cdd3e32ad14d2891ef59f2e
new file mode 100644
index 000..78c8031
--- /dev/null
+++ b/a5/f420bed1967c563cdd3e32ad14d2891ef59f2e
@@ -0,0 +1 @@
+prefer: 70afe780231dc086a07494db97a2bac2ca0a0939
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2013-06-06 Thread Caolán McNamara

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

New commits:
commit 4c1c2b2620aa639f8b8e781da9340786b9d16fb2
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 16:44:00 2013 +0100

Updated core
Project: help  da1f6d1195f1bd42bd4abbea49416bede5f6b069

diff --git a/helpcontent2 b/helpcontent2
index 76322cb..da1f6d1 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 76322cb521790cf7a592aafa3e378449037d1b30
+Subproject commit da1f6d1195f1bd42bd4abbea49416bede5f6b069
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Caolán McNamara

 writerfilter/source/dmapper/SdtHelper.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit c59219088b29d0e3482eafb70e7eecfc158a068b
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 11:58:23 2013 +0100

valgrind: uninit variable

Change-Id: I5640291d9e221c9cffd7daec9d46a313fddfaf4e
(cherry picked from commit b5d93a58a7f4e23432f18da0946bac04027c23a8)

Signed-off-by: Miklos Vajna 

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index 031b70f..58c092f 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -62,8 +62,9 @@ awt::Size lcl_getOptimalWidth(StyleSheetTablePtr pStyleSheet, 
OUString& rDefault
 return awt::Size(nWidth + nBorder + nHeight, nHeight + nBorder);
 }
 
-SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl):
-m_rDM_Impl(rDM_Impl)
+SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl)
+: m_rDM_Impl(rDM_Impl)
+, m_bHasElements(false)
 {
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Andras Timar

 solenv/gbuild/Gallery.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 80330c72ec3880ac56d88167a071ff244403f134
Author: Andras Timar 
Date:   Thu Jun 6 17:41:16 2013 +0200

fix .po file path in Gallery makefile

... which made localization actually work. I hope I did not
oversimplify a general scheme.

Change-Id: I942844fad6f869ad91b4c4134f06dd0b

diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index bf7d72c..0273b50 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -76,7 +76,7 @@ endef
 define gb_Gallery__command_ulf
 $(call gb_Output_announce,$(2),$(true),ULF,1)
 MERGEINPUT=`$(gb_MKTEMP)` && \
-echo $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst 
%/,%,$(dir $(GALLERY_BASEDIR))).po) > $${MERGEINPUT} && \
+echo $(foreach 
lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/extras/source/gallery/share.po) 
> $${MERGEINPUT} && \
 $(call gb_Helper_abbreviate_dirs,\
$(call gb_Executable_get_command,ulfex) -i $(GALLERY_ULFFILE) -o $(1) 
-m $${MERGEINPUT} -l all) && \
 rm -rf $${MERGEINPUT}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Caolán McNamara

 writerfilter/source/dmapper/SdtHelper.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 97db34a3a24054f750fd5308d1927a509f10a8b5
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 11:58:23 2013 +0100

valgrind: uninit variable

Change-Id: I5640291d9e221c9cffd7daec9d46a313fddfaf4e
(cherry picked from commit b5d93a58a7f4e23432f18da0946bac04027c23a8)

Signed-off-by: Miklos Vajna 

diff --git a/writerfilter/source/dmapper/SdtHelper.cxx 
b/writerfilter/source/dmapper/SdtHelper.cxx
index 5f5a1e4..7a5e5b1 100644
--- a/writerfilter/source/dmapper/SdtHelper.cxx
+++ b/writerfilter/source/dmapper/SdtHelper.cxx
@@ -62,8 +62,9 @@ awt::Size lcl_getOptimalWidth(StyleSheetTablePtr pStyleSheet, 
rtl::OUString& rDe
 return awt::Size(nWidth + nBorder + nHeight, nHeight + nBorder);
 }
 
-SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl):
-m_rDM_Impl(rDM_Impl)
+SdtHelper::SdtHelper(DomainMapper_Impl& rDM_Impl)
+: m_rDM_Impl(rDM_Impl)
+, m_bHasElements(false)
 {
 }
 
___
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

2013-06-06 Thread Caolán McNamara

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

New commits:
commit da1f6d1195f1bd42bd4abbea49416bede5f6b069
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 16:44:00 2013 +0100

update help ids for create automark dialog .ui conversion

Change-Id: I4e2d7939289cca8401d226c400c19a4fb4694c6a

diff --git a/helpers/help_hid.lst b/helpers/help_hid.lst
index 199c677..4cf099b 100644
--- a/helpers/help_hid.lst
+++ b/helpers/help_hid.lst
@@ -1449,7 +1449,6 @@ HID_DLG_ADABAS_TRANSACTIONLOG_SIZE,37287,
 HID_DLG_ADABAS_USR,37276,
 HID_DLG_ADD_IDX_STYLES,53243,
 HID_DLG_COLWIDTH,38837,
-HID_DLG_CREATE_AUTOMARK,54917,
 HID_DLG_DATABASE_WIZARD,39148,
 HID_DLG_DBCHANGE,34843,
 HID_DLG_ERROR,38842,
diff --git a/source/text/swriter/01/04120250.xhp 
b/source/text/swriter/01/04120250.xhp
index c547760..84f1e5a 100644
--- a/source/text/swriter/01/04120250.xhp
+++ b/source/text/swriter/01/04120250.xhp
@@ -32,8 +32,8 @@
 editing; concordance files
 concordance files; definition
 
-Edit Concordance File
-Create or edit a list of words 
to include in an Alphabetical Index. A concordance file lists words 
that should be referenced in an alphabetical index, together with the page 
number(s) where they appear in the document.
+Edit Concordance File
+Create or 
edit a list of words to include in an Alphabetical Index. A concordance 
file lists words that should be referenced in an alphabetical index, together 
with the page number(s) where they appear in the document.
 You 
can use the Find All button on the Find & Replace dialog to highlight all 
places where a word appears, then open the Insert Index Entry dialog to add 
that word and places to the alphabetical index. However, if you need the same 
set of alphabetical indexes in multiple documents, the concordance file allows 
to enter every word just once, then use the list many 
times.i61650
 To access the Edit Concordance File dialog:
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Luboš Luňák

 vcl/unx/generic/app/saldisp.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit c4f58395bd1f36a3ff4e2dd514907c74c86112b5
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Thu Jun 6 17:05:25 2013 +0200

simplify WM_COMMAND

it's not necessary to prepend /bin/sh to WM_COMMAND, soffice itself
already is executable

Change-Id: Iece77f901f233c8c675f524c8c88510d0cfc1c52

diff --git a/vcl/unx/generic/app/saldisp.cxx b/vcl/unx/generic/app/saldisp.cxx
index 90935aa..75b2d2e 100644
--- a/vcl/unx/generic/app/saldisp.cxx
+++ b/vcl/unx/generic/app/saldisp.cxx
@@ -494,10 +494,9 @@ SalDisplay::initScreen( SalX11Screen nXScreen ) const
  );
 
 OString aExec(OUStringToOString(SessionManagerClient::getExecName(), 
osl_getThreadTextEncoding()));
-const char* argv[2];
-argv[0] = "/bin/sh";
-argv[1] = aExec.getStr();
-XSetCommand( pDisp_, pSD->m_aRefWindow, const_cast(argv), 2 );
+const char* argv[1];
+argv[0] = aExec.getStr();
+XSetCommand( pDisp_, pSD->m_aRefWindow, const_cast(argv), 1 );
 XSelectInput( pDisp_, pSD->m_aRefWindow, PropertyChangeMask );
 
 // - - - - - - - - - - GCs - - - - - - - - - - - - - - - - -
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Tor Lillqvist

 sfx2/source/doc/objserv.cxx |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit db77d9700e1301c7cb47a76721639dd4c7829f31
Author: Tor Lillqvist 
Date:   Thu Jun 6 19:12:55 2013 +0300

WaE: unused variable 'pFilt'

Change-Id: I58bacc42d9b596ffef62237d0554fb0a3bff50a1

diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index cfd21cf..b2747f4 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -687,9 +687,6 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq)
 SFX_REQUEST_ARG( rReq, pFilterNameItem, SfxStringItem, 
SID_FILTER_NAME, sal_False );
 OUString aFilterName = pFilterNameItem ? OUString( 
pFilterNameItem->GetValue() )
   : OUString();
-const SfxFilter* pFilt = 
GetFactory().GetFilterContainer()->GetFilter4FilterName( aFilterName );
-
-OSL_ENSURE( nId == SID_SAVEDOC || pFilt, "The filter can not 
be zero since it was used for storing!\n" );
 
 // the StoreAsURL/StoreToURL method have called this method 
with false
 // so it has to be restored to true here since it is a call 
from GUI
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Armin Le Grand

 include/svx/charthelper.hxx  |   12 
 sc/source/filter/excel/xiescher.cxx  |5 +
 sc/source/filter/starcalc/scfobj.cxx |5 +
 sc/source/ui/drawfunc/fuins2.cxx |   21 +
 sc/source/ui/unoobj/chartuno.cxx |5 +
 sc/source/ui/view/output3.cxx|4 
 sd/source/ui/func/fuinsert.cxx   |4 ++--
 sd/source/ui/inc/ViewShell.hxx   |3 ---
 sd/source/ui/view/viewshe2.cxx   |   30 ++
 svx/source/svdraw/charthelper.cxx|   34 ++
 sw/source/ui/table/tablemgr.cxx  |4 
 11 files changed, 74 insertions(+), 53 deletions(-)

New commits:
commit 7c486ba2574486f886612b8c4c130c55acd7d93e
Author: Armin Le Grand 
Date:   Wed Nov 14 11:09:12 2012 +

Resolves: #i121334# Changed default for charts background to be none...

(from white) to allow fill settings in the various apps to have an
effect

(cherry picked from commit 0050a8e4eace17ed1b55c7ec919edaa0daadc3a7)

Conflicts:
chart2/source/model/main/PageBackground.cxx
sc/source/ui/drawfunc/fuins2.cxx
sd/source/ui/view/viewshe2.cxx

Related: #i121334# turned back chart non-fill defaults...

done the non-fill using tooling when creating new chart modules

(cherry picked from commit af9220c24c9d80e5415d9d7d8f273b28d0d27cdb)

Conflicts:
chart2/source/model/main/PageBackground.cxx
sc/source/filter/starcalc/scfobj.cxx
sd/source/ui/view/viewshe2.cxx
svx/inc/svx/charthelper.hxx
svx/source/svdraw/charthelper.cxx
sw/source/ui/table/tablemgr.cxx

Related: #i121334# deactivated setting chart OLE background to 
transparent...

for better UI experience and better back-compatibility to other OpenOffice
derivates

(cherry picked from commit 5fa621198a981ea994d9903298e8a1d884ee686b)

Unname unused arguments to prevent compiler warnings.

(cherry picked from commit c3c4df7647d8d4ab1425bb3c7f38932c4adcbe74)

Change-Id: I1b4579aca701a4d637d21d7963b87f637458d0a5
01855cc3d4ec3c321109f924f6de4cdfbec4cd5d
18757f64ae84a415dc781929db4b76f571172ab1
de9879c2e1c249c0d957e4e46723b167ae1a8e90

diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx
index 3b43c4b..1575a0b 100644
--- a/include/svx/charthelper.hxx
+++ b/include/svx/charthelper.hxx
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 //
 // predeclarations
@@ -45,6 +46,17 @@ public:
 static drawinglayer::primitive2d::Primitive2DSequence 
tryToGetChartContentAsPrimitive2DSequence(
 const ::com::sun::star::uno::Reference< 
::com::sun::star::frame::XModel >& rXModel,
 basegfx::B2DRange& rRange);
+
+// #i121334# Allow to switch off line and fill style by setting these as 
attributes
+// at the OLE chart object. This is needed to allow fill styles of the 
covering objects
+// to make their own fill/line settings work. This should not be done by 
changing
+// the defaults at the chart (see 
StaticPageBackgroundDefaults_Initializer::lcl_AddDefaultsToMap)
+// since this would not be saved/loaded, thus the compatibility will be 
better when setting it at
+// newly created charts using this method
+static void AdaptDefaultsForChart(
+const com::sun::star::uno::Reference < 
com::sun::star::embed::XEmbeddedObject > & xEmbObj,
+bool bNoFillStyle = true,
+bool bNoLineStyle = true);
 };
 
 //
diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index 7db78f3..87014d7 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -67,6 +67,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "scitems.hxx"
 #include 
@@ -1660,6 +1661,10 @@ SdrObject* XclImpChartObj::DoCreateSdrObj( 
XclImpDffConverter& rDffConv, const R
 ::com::sun::star::awt::Size aAwtSize( aSize.Width(), aSize.Height() );
 xEmbObj->setVisualAreaSize( nAspect, aAwtSize );
 
+// #i121334# This call will change the chart's default background fill 
from white to transparent.
+// Add here again if this is wanted (see task description for details)
+// ChartHelper::AdaptDefaultsForChart( xEmbObj );
+
 // create the container OLE object
 xSdrObj.reset( new SdrOle2Obj( svt::EmbeddedObjectRef( xEmbObj, 
nAspect ), aEmbObjName, rAnchorRect ) );
 }
diff --git a/sc/source/filter/starcalc/scfobj.cxx 
b/sc/source/filter/starcalc/scfobj.cxx
index 1ce0037..cc05e71 100644
--- a/sc/source/filter/starcalc/scfobj.cxx
+++ b/sc/source/filter/starcalc/scfobj.cxx
@@ -25,6 +25,7 @@
 using namespace com::sun::star;
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 00/50a8e4eace17ed1b55c7ec919edaa0daadc3a7

2013-06-06 Thread Caolán McNamara

 00/50a8e4eace17ed1b55c7ec919edaa0daadc3a7 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit dc8b5b2e7e6526a08195d2642bbd4af21bd73fe3
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 17:24:54 2013 +0100

Notes added by 'git notes add'

diff --git a/00/50a8e4eace17ed1b55c7ec919edaa0daadc3a7 
b/00/50a8e4eace17ed1b55c7ec919edaa0daadc3a7
new file mode 100644
index 000..c659f17
--- /dev/null
+++ b/00/50a8e4eace17ed1b55c7ec919edaa0daadc3a7
@@ -0,0 +1 @@
+merged as: 7c486ba2574486f886612b8c4c130c55acd7d93e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 3 commits - 5f/a621198a981ea994d9903298e8a1d884ee686b af/9220c24c9d80e5415d9d7d8f273b28d0d27cdb c3/c4df7647d8d4ab1425bb3c7f38932c4adcbe74

2013-06-06 Thread Caolán McNamara

 5f/a621198a981ea994d9903298e8a1d884ee686b |1 +
 af/9220c24c9d80e5415d9d7d8f273b28d0d27cdb |1 +
 c3/c4df7647d8d4ab1425bb3c7f38932c4adcbe74 |1 +
 3 files changed, 3 insertions(+)

New commits:
commit ce0b8089fc6a2e14fcfce755ad4fc5adcdf7f8d6
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 17:25:15 2013 +0100

Notes added by 'git notes add'

diff --git a/c3/c4df7647d8d4ab1425bb3c7f38932c4adcbe74 
b/c3/c4df7647d8d4ab1425bb3c7f38932c4adcbe74
new file mode 100644
index 000..c659f17
--- /dev/null
+++ b/c3/c4df7647d8d4ab1425bb3c7f38932c4adcbe74
@@ -0,0 +1 @@
+merged as: 7c486ba2574486f886612b8c4c130c55acd7d93e
commit 11c6bde3026d351da12e84a9d780c51a9fc78de0
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 17:25:08 2013 +0100

Notes added by 'git notes add'

diff --git a/5f/a621198a981ea994d9903298e8a1d884ee686b 
b/5f/a621198a981ea994d9903298e8a1d884ee686b
new file mode 100644
index 000..c659f17
--- /dev/null
+++ b/5f/a621198a981ea994d9903298e8a1d884ee686b
@@ -0,0 +1 @@
+merged as: 7c486ba2574486f886612b8c4c130c55acd7d93e
commit 3ca92aee48ed4c1fe0514aed19b5a495a6a205aa
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 17:25:00 2013 +0100

Notes added by 'git notes add'

diff --git a/af/9220c24c9d80e5415d9d7d8f273b28d0d27cdb 
b/af/9220c24c9d80e5415d9d7d8f273b28d0d27cdb
new file mode 100644
index 000..c659f17
--- /dev/null
+++ b/af/9220c24c9d80e5415d9d7d8f273b28d0d27cdb
@@ -0,0 +1 @@
+merged as: 7c486ba2574486f886612b8c4c130c55acd7d93e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 9f/297d6b76194047b30d7edf11f0ee90504ed96a

2013-06-06 Thread Caolán McNamara

 9f/297d6b76194047b30d7edf11f0ee90504ed96a |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d27f09630b344116cdf579a509e58284814bab09
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 17:27:06 2013 +0100

Notes added by 'git notes add'

diff --git a/9f/297d6b76194047b30d7edf11f0ee90504ed96a 
b/9f/297d6b76194047b30d7edf11f0ee90504ed96a
new file mode 100644
index 000..d7e558d
--- /dev/null
+++ b/9f/297d6b76194047b30d7edf11f0ee90504ed96a
@@ -0,0 +1 @@
+prefer: 3b65852f37f1c8daf8c5c0af1d810c68cc71d8e3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2a/7381f63b45e6a341db2ece259cd0d6f6b6b02d

2013-06-06 Thread Caolán McNamara

 2a/7381f63b45e6a341db2ece259cd0d6f6b6b02d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit f6d6d696c369c724179712899814681bc8825b17
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 17:33:54 2013 +0100

Notes added by 'git notes add'

diff --git a/2a/7381f63b45e6a341db2ece259cd0d6f6b6b02d 
b/2a/7381f63b45e6a341db2ece259cd0d6f6b6b02d
new file mode 100644
index 000..d84321a
--- /dev/null
+++ b/2a/7381f63b45e6a341db2ece259cd0d6f6b6b02d
@@ -0,0 +1 @@
+merged as: 3106ed122c927c2a732cc92b2ee5f5066d27d5f8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sysui/desktop vcl/generic vcl/inc vcl/unx

2013-06-06 Thread Luboš Luňák

 sysui/desktop/menus/base.desktop|1 +
 sysui/desktop/menus/calc.desktop|1 +
 sysui/desktop/menus/draw.desktop|1 +
 sysui/desktop/menus/impress.desktop |1 +
 sysui/desktop/menus/math.desktop|1 +
 sysui/desktop/menus/startcenter.desktop |1 +
 sysui/desktop/menus/writer.desktop  |1 +
 vcl/generic/app/gensys.cxx  |   16 
 vcl/inc/generic/gensys.h|1 -
 vcl/unx/generic/window/salframe.cxx |2 +-
 vcl/unx/gtk/window/gtksalframe.cxx  |2 +-
 11 files changed, 13 insertions(+), 15 deletions(-)

New commits:
commit bd40bfd897f193857de10f64bbc47909c4ea5757
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Thu Jun 6 18:34:20 2013 +0200

fix WM_CLASS

VCLSalFrame is definitely not the name of any instance of LibreOffice.

Change-Id: Iba227061c0c0541290c90876c94d1016aa1e783e

diff --git a/vcl/generic/app/gensys.cxx b/vcl/generic/app/gensys.cxx
index 68d2192..c65f0e5 100644
--- a/vcl/generic/app/gensys.cxx
+++ b/vcl/generic/app/gensys.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "vcl/unohelp.hxx"
 #include 
@@ -179,7 +180,8 @@ const char* SalGenericSystem::getFrameResName()
 aResName.append( pEnv );
 }
 if( !aResName.getLength() )
-aResName.append( "VCLSalFrame" );
+aResName.append( OUStringToOString( 
utl::ConfigManager::getProductName().toAsciiLowerCase(),
+osl_getThreadTextEncoding()));
 }
 return aResName.getStr();
 }
@@ -198,21 +200,11 @@ const char* SalGenericSystem::getFrameClassName()
 if( !aProduct.isEmpty() )
 aClassName.append( OUStringToOString( aProduct, 
osl_getThreadTextEncoding() ) );
 else
-aClassName.append( "VCLSalFrame" );
+aClassName.append( OUStringToOString( 
utl::ConfigManager::getProductName(), osl_getThreadTextEncoding()));
 }
 return aClassName.getStr();
 }
 
-OString SalGenericSystem::getFrameResName( SalExtStyle nStyle )
-{
-OStringBuffer aBuf( 64 );
-aBuf.append( getFrameResName() );
-if( (nStyle & SAL_FRAME_EXT_STYLE_DOCUMENT) )
-aBuf.append( ".DocumentWindow" );
-
-return aBuf.makeStringAndClear();
-}
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/generic/gensys.h b/vcl/inc/generic/gensys.h
index d60cc17..25d73a0 100644
--- a/vcl/inc/generic/gensys.h
+++ b/vcl/inc/generic/gensys.h
@@ -47,7 +47,6 @@ class VCL_DLLPUBLIC SalGenericSystem : public SalSystem
 // Simple helpers for X11 WM_CLASS hints
 static const char *getFrameResName();
 static const char *getFrameClassName();
-static OString getFrameResName( SalExtStyle nStyle );
 #endif
 };
 
diff --git a/vcl/unx/generic/window/salframe.cxx 
b/vcl/unx/generic/window/salframe.cxx
index 374fce0..0ef369e 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -2042,7 +2042,7 @@ void X11SalFrame::SetApplicationID( const OUString 
&rWMClass )
 void X11SalFrame::updateWMClass()
 {
 XClassHint* pClass = XAllocClassHint();
-OString aResName = SalGenericSystem::getFrameResName( mnExtStyle );
+OString aResName = SalGenericSystem::getFrameResName();
 pClass->res_name  = const_cast(aResName.getStr());
 
 OString aResClass = OUStringToOString(m_sWMClass, 
RTL_TEXTENCODING_ASCII_US);
diff --git a/vcl/unx/gtk/window/gtksalframe.cxx 
b/vcl/unx/gtk/window/gtksalframe.cxx
index 0f53e93..254437f 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2170,7 +2170,7 @@ void GtkSalFrame::updateWMClass()
 if( IS_WIDGET_REALIZED( m_pWindow ) )
 {
 XClassHint* pClass = XAllocClassHint();
-OString aResName = SalGenericSystem::getFrameResName( m_nExtStyle );
+OString aResName = SalGenericSystem::getFrameResName();
 pClass->res_name  = const_cast(aResName.getStr());
 pClass->res_class = const_cast(pResClass);
 XSetClassHint( display,
commit 4d479ebf1511fd0c2b8bff0f6aa26305709aa338
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Thu Jun 6 18:28:07 2013 +0200

add StartupWMClass= to .desktop files (bnc#777070)

The actual purpose is to help Plasma taskbar associate taskbar items
with .desktop files for the purpose of creating launchers. LibreOffice's
WM_CLASS handling is rather broken, but the class part of it usually
ends up being 'libreoffice-', which however doesn't match
names of .desktop files or executables. I fear renaming .desktop files
would cause too much breakages in various places that expect the current
names, so adding StartupWMClass will help Plasma match them.

Change-Id: Ia946307b429d9a7c00408b2b508726fdc88908ac

diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 5756260..d21293d 100755
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@

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

2013-06-06 Thread Luboš Luňák

 sysui/desktop/menus/base.desktop|1 +
 sysui/desktop/menus/calc.desktop|1 +
 sysui/desktop/menus/draw.desktop|1 +
 sysui/desktop/menus/impress.desktop |1 +
 sysui/desktop/menus/math.desktop|1 +
 sysui/desktop/menus/startcenter.desktop |1 +
 sysui/desktop/menus/writer.desktop  |1 +
 7 files changed, 7 insertions(+)

New commits:
commit ecde9ba00dcf8c1bf3413afd0281236e9429148f
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Thu Jun 6 18:28:07 2013 +0200

add StartupWMClass= to .desktop files (bnc#777070)

The actual purpose is to help Plasma taskbar associate taskbar items
with .desktop files for the purpose of creating launchers. LibreOffice's
WM_CLASS handling is rather broken, but the class part of it usually
ends up being 'libreoffice-', which however doesn't match
names of .desktop files or executables. I fear renaming .desktop files
would cause too much breakages in various places that expect the current
names, so adding StartupWMClass will help Plasma match them.

Change-Id: Ia946307b429d9a7c00408b2b508726fdc88908ac

diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop
index 5756260..d21293d 100755
--- a/sysui/desktop/menus/base.desktop
+++ b/sysui/desktop/menus/base.desktop
@@ -31,6 +31,7 @@ X-GIO-NoFuse=true
 Keywords=Data;SQL;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
+StartupWMClass=libreoffice-base
 [X-New Shortcut Group]
 UnityQuicklist=New Database
 Exec=libreoffice --base %%FILE%%
diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop
index 81be9a8..a259fd0 100755
--- a/sysui/desktop/menus/calc.desktop
+++ b/sysui/desktop/menus/calc.desktop
@@ -31,6 +31,7 @@ X-GIO-NoFuse=true
 Keywords=Accounting;Stats;OpenDocument Spreadsheet;Chart;Microsoft 
Excel;Microsoft Works;OpenOffice Calc;ods;xls;xlsx;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
+StartupWMClass=libreoffice-calc
 [X-New Shortcut Group]
 UnityQuicklist=New Spreadsheet
 Exec=libreoffice --calc %%FILE%%
diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop
index 9e56d05..11acf93 100755
--- a/sysui/desktop/menus/draw.desktop
+++ b/sysui/desktop/menus/draw.desktop
@@ -31,6 +31,7 @@ X-GIO-NoFuse=true
 Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft 
Publisher;Corel Draw;cdr;odg;svg;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
+StartupWMClass=libreoffice-draw
 [X-New Shortcut Group]
 UnityQuicklist=New Drawing
 Exec=libreoffice --draw %%FILE%%
diff --git a/sysui/desktop/menus/impress.desktop 
b/sysui/desktop/menus/impress.desktop
index 10c9cec..91ec579 100755
--- a/sysui/desktop/menus/impress.desktop
+++ b/sysui/desktop/menus/impress.desktop
@@ -31,6 +31,7 @@ X-GIO-NoFuse=true
 Keywords=Slideshow;Slides;OpenDocument Presentation;Microsoft 
PowerPoint;Microsoft Works;OpenOffice Impress;odp;ppt;pptx;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
+StartupWMClass=libreoffice-impress
 [X-New Shortcut Group]
 UnityQuicklist=New Presentation
 Exec=libreoffice --impress %%FILE%%
diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop
index 2e0d344..00f2fd5 100755
--- a/sysui/desktop/menus/math.desktop
+++ b/sysui/desktop/menus/math.desktop
@@ -32,6 +32,7 @@ X-GIO-NoFuse=true
 Keywords=Equation;OpenDocument Formula;Formula;odf;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
+StartupWMClass=libreoffice-math
 [X-New Shortcut Group]
 UnityQuicklist=New Formula
 Exec=libreoffice --math %%FILE%%
diff --git a/sysui/desktop/menus/startcenter.desktop 
b/sysui/desktop/menus/startcenter.desktop
index d8b0f1a..9312def 100755
--- a/sysui/desktop/menus/startcenter.desktop
+++ b/sysui/desktop/menus/startcenter.desktop
@@ -29,3 +29,4 @@ GenericName=Office
 Comment=The office productivity suite compatible to the open and standardized 
ODF document format. Supported by The Document Foundation.
 StartupNotify=true
 X-GIO-NoFuse=true
+StartupWMClass=libreoffice-startcenter
diff --git a/sysui/desktop/menus/writer.desktop 
b/sysui/desktop/menus/writer.desktop
index 1eef64e..202daba 100755
--- a/sysui/desktop/menus/writer.desktop
+++ b/sysui/desktop/menus/writer.desktop
@@ -31,6 +31,7 @@ X-GIO-NoFuse=true
 Keywords=Text;Letter;Fax;Document;OpenDocument Text;Microsoft Word;Microsoft 
Works;Lotus WordPro;OpenOffice Writer;CV;odt;doc;docx;rtf;
 InitialPreference=5
 X-Ayatana-Desktop-Shortcuts=X-New
+StartupWMClass=libreoffice-writer
 [X-New Shortcut Group]
 UnityQuicklist=New Document
 Exec=libreoffice --writer %%FILE%%
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Caolán McNamara

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |3 +++
 writerfilter/source/ooxml/OOXMLParserState.cxx|3 +++
 2 files changed, 6 insertions(+)

New commits:
commit 81b23a2aad0ab1a72cc292f1b3fca663363c4fee
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 11:41:03 2013 +0100

add some checks against NULL derefs

Change-Id: I85fbf279991ee361ea081d92d9acc84d36677af1
(cherry picked from commit fa671cecd4bb2f38a0a9171cfdbb56efddda1cfa)

Signed-off-by: Miklos Vajna 

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index f4a7924..205f821 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1335,6 +1335,9 @@ void OOXMLFastContextHandlerProperties::lcl_endFastElement
 {
 if (isForwardEvents())
 {
+SAL_WARN_IF(!mpStream, "writerfilter", "no stream to set 
properties on");
+if (!mpStream)
+return;
 mpStream->props(mpPropertySet);
 }
 }
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx 
b/writerfilter/source/ooxml/OOXMLParserState.cxx
index c2dc79c..4942375 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -125,6 +125,9 @@ OOXMLDocument * OOXMLParserState::getDocument() const
 
 void OOXMLParserState::setXNoteId(const sal_Int32 nId)
 {
+SAL_WARN_IF(!mpDocument, "writerfilter", "no document to set note id on");
+if (!mpDocument)
+return;
 mpDocument->setXNoteId(nId);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Caolán McNamara

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |3 +++
 writerfilter/source/ooxml/OOXMLParserState.cxx|3 +++
 2 files changed, 6 insertions(+)

New commits:
commit 098819a289651793d4dc198dfb0a044ff723893f
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 11:41:03 2013 +0100

add some checks against NULL derefs

(cherry picked from commit fa671cecd4bb2f38a0a9171cfdbb56efddda1cfa)

Change-Id: I85fbf279991ee361ea081d92d9acc84d36677af1
Signed-off-by: Miklos Vajna 

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 5865846..c8af924 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1335,6 +1335,9 @@ void OOXMLFastContextHandlerProperties::lcl_endFastElement
 {
 if (isForwardEvents())
 {
+SAL_WARN_IF(!mpStream, "writerfilter", "no stream to set 
properties on");
+if (!mpStream)
+return;
 mpStream->props(mpPropertySet);
 }
 }
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx 
b/writerfilter/source/ooxml/OOXMLParserState.cxx
index 45f8b1c..723aef8 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -125,6 +125,9 @@ OOXMLDocument * OOXMLParserState::getDocument() const
 
 void OOXMLParserState::setXNoteId(const sal_Int32 nId)
 {
+SAL_WARN_IF(!mpDocument, "writerfilter", "no document to set note id on");
+if (!mpDocument)
+return;
 mpDocument->setXNoteId(nId);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-3-6' - writerfilter/source

2013-06-06 Thread Caolán McNamara

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |3 +++
 writerfilter/source/ooxml/OOXMLParserState.cxx|3 +++
 2 files changed, 6 insertions(+)

New commits:
commit 0aece9e50bd06c16cf15b4cb7d45dd1f98d1800c
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 11:41:03 2013 +0100

add some checks against NULL derefs

Change-Id: I85fbf279991ee361ea081d92d9acc84d36677af1
(cherry picked from commit fa671cecd4bb2f38a0a9171cfdbb56efddda1cfa)

Signed-off-by: Miklos Vajna 

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 097fb3f..df91778 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1317,6 +1317,9 @@ void OOXMLFastContextHandlerProperties::lcl_endFastElement
 {
 if (isForwardEvents())
 {
+SAL_WARN_IF(!mpStream, "writerfilter", "no stream to set 
properties on");
+if (!mpStream)
+return;
 mpStream->props(mpPropertySet);
 }
 }
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx 
b/writerfilter/source/ooxml/OOXMLParserState.cxx
index 7e9b474..1352d73 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -135,6 +135,9 @@ OOXMLDocument * OOXMLParserState::getDocument() const
 
 void OOXMLParserState::setXNoteId(const sal_Int32 nId)
 {
+SAL_WARN_IF(!mpDocument, "writerfilter", "no document to set note id on");
+if (!mpDocument)
+return;
 mpDocument->setXNoteId(nId);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Caolán McNamara

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |3 +++
 writerfilter/source/ooxml/OOXMLParserState.cxx|3 +++
 2 files changed, 6 insertions(+)

New commits:
commit 6fb45a8c8bf7f5560e0e88f810e753c0d65b625e
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 11:41:03 2013 +0100

add some checks against NULL derefs

Change-Id: I85fbf279991ee361ea081d92d9acc84d36677af1
(cherry picked from commit fa671cecd4bb2f38a0a9171cfdbb56efddda1cfa)

Signed-off-by: Miklos Vajna 

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 11e8523..7964c3e 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1335,6 +1335,9 @@ void OOXMLFastContextHandlerProperties::lcl_endFastElement
 {
 if (isForwardEvents())
 {
+SAL_WARN_IF(!mpStream, "writerfilter", "no stream to set 
properties on");
+if (!mpStream)
+return;
 mpStream->props(mpPropertySet);
 }
 }
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx 
b/writerfilter/source/ooxml/OOXMLParserState.cxx
index 45f8b1c..723aef8 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -125,6 +125,9 @@ OOXMLDocument * OOXMLParserState::getDocument() const
 
 void OOXMLParserState::setXNoteId(const sal_Int32 nId)
 {
+SAL_WARN_IF(!mpDocument, "writerfilter", "no document to set note id on");
+if (!mpDocument)
+return;
 mpDocument->setXNoteId(nId);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Caolán McNamara

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |3 +++
 writerfilter/source/ooxml/OOXMLParserState.cxx|3 +++
 2 files changed, 6 insertions(+)

New commits:
commit 31ca5ba5150ea8fb3666d8b5da5cdbadaafedd5e
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 11:41:03 2013 +0100

add some checks against NULL derefs

Change-Id: I85fbf279991ee361ea081d92d9acc84d36677af1
(cherry picked from commit fa671cecd4bb2f38a0a9171cfdbb56efddda1cfa)

Signed-off-by: Miklos Vajna 

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx 
b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 24af62c..7edbaec 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -1343,6 +1343,9 @@ void OOXMLFastContextHandlerProperties::lcl_endFastElement
 {
 if (isForwardEvents())
 {
+SAL_WARN_IF(!mpStream, "writerfilter", "no stream to set 
properties on");
+if (!mpStream)
+return;
 mpStream->props(mpPropertySet);
 }
 }
diff --git a/writerfilter/source/ooxml/OOXMLParserState.cxx 
b/writerfilter/source/ooxml/OOXMLParserState.cxx
index 7e9b474..1352d73 100644
--- a/writerfilter/source/ooxml/OOXMLParserState.cxx
+++ b/writerfilter/source/ooxml/OOXMLParserState.cxx
@@ -135,6 +135,9 @@ OOXMLDocument * OOXMLParserState::getDocument() const
 
 void OOXMLParserState::setXNoteId(const sal_Int32 nId)
 {
+SAL_WARN_IF(!mpDocument, "writerfilter", "no document to set note id on");
+if (!mpDocument)
+return;
 mpDocument->setXNoteId(nId);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: 5 commits - gerritbot/gerrit_daily_digest gerritbot/send-daily-digest scripts/gerrit_daily_digest.py

2013-06-06 Thread Bjoern Michaelsen

 gerritbot/gerrit_daily_digest  |   39 +++
 gerritbot/send-daily-digest|   69 +
 scripts/gerrit_daily_digest.py |   64 --
 3 files changed, 108 insertions(+), 64 deletions(-)

New commits:
commit 792546d5773879580fb4f30d3e76c20387c3dc74
Author: Bjoern Michaelsen 
Date:   Thu Jun 6 19:26:44 2013 +0200

initial version -- still doesnt send

diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest
new file mode 100755
index 000..90274bc
--- /dev/null
+++ b/gerritbot/send-daily-digest
@@ -0,0 +1,69 @@
+#!/usr/bin/env python
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+import argparse
+import codecs
+import datetime
+import email
+import json
+import os
+import sh
+import smtplib
+import sys
+
+def get_daily_query(status, age):
+return 'project:core branch:master status:%s -age:%dh' % (status, age)
+
+def get_digest(gerrit, query):
+digest = ''
+for line in sh.ssh(gerrit, 'gerrit query --format=JSON \'%s\'' % 
query).strip().split('\n'):
+change = json.loads(line)
+if 'url' in change.keys():
+digest += '%s %s %s\n' % (change['url'], 
change['subject'].ljust(75)[:75], change['owner']['email'])
+if digest == '':
+digest = 'None'
+return digest
+
+def create_message(gerrit, age):
+now = datetime.datetime.now()
+message = '''From: ger...@libreoffice.org
+To: libreoffice@lists.freedesktop.org
+Date: %s
+Subject: LibreOffice Gerrit news %s
+Reply-To: libreoffice@lists.freedesktop.org
+X-Mailer: LibreOfficeGerritDigestMailer 1.0
+
+''' % (now, now.date().isoformat())
+message += 'Moin!\n\n'
+message += 'open changes on master for project core changed in the last %d 
hours:\n' % age
+message += get_digest(gerrit, get_daily_query('open', age))
+message += '\n\nmerged changes on master for project core changed in the 
last %d hours:\n' % age
+message += get_digest(gerrit, get_daily_query('merged', age))
+message += '\n\nabandoned changes on master for project core changed in 
the last %d hours:\n' % age
+message += get_digest(gerrit, get_daily_query('abandoned', age))
+message += '\n\nOpen changes needing tweaks, but being untouched for more 
than a week:\n'
+message += get_digest(gerrit, 'project:core branch:master status:open 
(label:Code-Review<=-1 label:Verified<=-1) age:1w')
+message += '''
+
+Best,
+
+Your friendly LibreOffice Gerrit Digest Mailer'''
+return message
+
+if __name__ == '__main__':
+parser = argparse.ArgumentParser('gerrit daily digest generator')
+parser.add_argument('-g', '--gerrit', help='(i. e. logerrit or 
gerrit.libreoffice.org, use alias in your ~/.ssh(config with your public key)', 
required=True)
+args=vars(parser.parse_args())
+   #server = smtplib.SMTP('localhost')
+#server.sendmail('ger...@libreoffice.org', 
'libreoffice@lists.freedesktop.org', str(message))
+   #server.quit()
+sys.stdout = codecs.getwriter("utf-8")(sys.stdout)
+print(create_message(args['gerrit'], 25))
+# vim: set et sw=4 ts=4:
commit 1d38493ce916c39c9289b8ba32bead3f026c9907
Author: Bjoern Michaelsen 
Date:   Thu Jun 6 15:36:52 2013 +0200

no ugly file extension needed

diff --git a/gerritbot/gerrit_daily_digest b/gerritbot/gerrit_daily_digest
new file mode 100755
index 000..02ca161
--- /dev/null
+++ b/gerritbot/gerrit_daily_digest
@@ -0,0 +1,39 @@
+#!/usr/bin/env python
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+'''
+Created on 19.06.2012
+
+@author: david ostrovsky
+'''
+
+from json import loads
+import argparse
+import sh
+
+def main():
+parser = argparse.ArgumentParser('gerrit daily digest generator')
+parser.add_argument('-s', '--status', choices=['open', 'merged', 
'abandoned'], required=True)
+parser.add_argument('-g', '--gerrit', help='(i. e. logerrit or 
gerrit.libreoffice.org, use alias in your ~/.ssh(config with your public key)', 
required=True)
+parser.add_argument('-p', '--project', help='(i. e. core)', required=True)
+parser.add_argument('-b', '--branch', help='(i. e. master)', required=True)
+args=vars(parser.parse_args())
+gerrit_host_name = args['gerrit']
+status = args['status']
+project = args['project']
+branch = args['branch']
+lines = sh.ssh(gerrit_host_name, 'gerrit', 'query', '--format=JSON', 
'status:%s' % status, 'project:%s

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

2013-06-06 Thread Takeshi Abe

 include/vcl/wmf.hxx  |4 +--
 sd/source/ui/unoidl/unopage.cxx  |2 -
 svtools/source/misc/transfer.cxx |2 -
 svx/source/unodraw/unoshap2.cxx  |2 -
 svx/source/unodraw/unoshap4.cxx  |2 -
 svx/source/unodraw/unoshape.cxx  |4 +--
 vcl/source/filter/sgvmain.hxx|2 -
 vcl/source/filter/sgvtext.cxx|6 ++---
 vcl/source/filter/wmf/emfwr.cxx  |4 +--
 vcl/source/filter/wmf/enhwmf.cxx |8 +++
 vcl/source/filter/wmf/winmtf.cxx |   26 -
 vcl/source/filter/wmf/winwmf.cxx |4 +--
 vcl/source/filter/wmf/wmf.cxx|8 +++
 vcl/source/filter/wmf/wmfwr.cxx  |   40 +++
 vcl/source/filter/wmf/wmfwr.hxx  |   18 -
 15 files changed, 66 insertions(+), 66 deletions(-)

New commits:
commit 50a4018d0d95652b73175f37740c9c7dd13ca4e0
Author: Takeshi Abe 
Date:   Fri Jun 7 02:26:01 2013 +0900

sal_Bool to bool

Change-Id: I58efb9d026203c77d3806552bd4280a4d16d5111

diff --git a/include/vcl/wmf.hxx b/include/vcl/wmf.hxx
index ed0b5e2..2293f72 100644
--- a/include/vcl/wmf.hxx
+++ b/include/vcl/wmf.hxx
@@ -59,11 +59,11 @@ sal_Bool ConvertWMFToGDIMetaFile( SvStream & rStreamWMF, 
GDIMetaFile & rGDIMetaF
 
 VCL_DLLPUBLIC sal_Bool ReadWindowMetafile( SvStream& rStream, GDIMetaFile& 
rMTF, FilterConfigItem* pConfigItem );
 
-VCL_DLLPUBLIC sal_Bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, 
SvStream & rTargetStream, FilterConfigItem* pConfigItem = NULL, sal_Bool 
bPlaceable = sal_True );
+VCL_DLLPUBLIC bool ConvertGDIMetaFileToWMF( const GDIMetaFile & rMTF, SvStream 
& rTargetStream, FilterConfigItem* pConfigItem = NULL, bool bPlaceable = true );
 
 sal_Bool ConvertGDIMetaFileToEMF( const GDIMetaFile & rMTF, SvStream & 
rTargetStream, FilterConfigItem* pConfigItem = NULL );
 
-VCL_DLLPUBLIC sal_Bool WriteWindowMetafileBits( SvStream& rStream, const 
GDIMetaFile& rMTF );
+VCL_DLLPUBLIC bool WriteWindowMetafileBits( SvStream& rStream, const 
GDIMetaFile& rMTF );
 
 #endif
 
diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx
index 12926e2..1fb509a 100644
--- a/sd/source/ui/unoidl/unopage.cxx
+++ b/sd/source/ui/unoidl/unopage.cxx
@@ -1090,7 +1090,7 @@ Any SAL_CALL SdGenericDrawPage::getPropertyValue( const 
OUString& PropertyName )
 pMetaFile->SetPrefSize( aSize );
 
 SvMemoryStream aDestStrm( 65535, 65535 );
-ConvertGDIMetaFileToWMF( *pMetaFile, aDestStrm, NULL, 
sal_False );
+ConvertGDIMetaFileToWMF( *pMetaFile, aDestStrm, NULL, 
false );
 Sequence aSeq( 
(sal_Int8*)aDestStrm.GetData(), aDestStrm.Tell() );
 aAny <<= aSeq;
 }
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index d7a1072..c1806c4 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -416,7 +416,7 @@ Any SAL_CALL TransferableHelper::getTransferData( const 
DataFlavor& rFlavor ) th
 SvMemoryStream  aDstStm( 65535, 65535 );
 
 // taking wmf without file header
-if ( ConvertGDIMetaFileToWMF( aMtf, aDstStm, NULL, 
sal_False ) )
+if ( ConvertGDIMetaFileToWMF( aMtf, aDstStm, NULL, 
false ) )
 {
 maAny <<= ( aSeq = Sequence< sal_Int8 >( 
reinterpret_cast< const sal_Int8* >( aDstStm.GetData() ),
  
aDstStm.Seek( STREAM_SEEK_TO_END ) ) );
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index e96f7e1..0b89df2 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1626,7 +1626,7 @@ bool SvxGraphicObject::getPropertyValueImpl( const 
OUString& rName, const SfxIte
 {
 SvMemoryStream aDestStrm( 65535, 65535 );
 
-ConvertGDIMetaFileToWMF( rGraphic.GetGDIMetaFile(), aDestStrm, 
NULL, sal_False );
+ConvertGDIMetaFileToWMF( rGraphic.GetGDIMetaFile(), aDestStrm, 
NULL, false );
 const uno::Sequence aSeq(
 static_cast< const sal_Int8* >(aDestStrm.GetData()),
 aDestStrm.GetEndOfData());
diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx
index 59b8b59..768896d 100644
--- a/svx/source/unodraw/unoshap4.cxx
+++ b/svx/source/unodraw/unoshap4.cxx
@@ -239,7 +239,7 @@ bool SvxOle2Shape::getPropertyValueImpl( const OUString& 
rName, const SfxItemPro
 // #i119735# just use GetGDIMetaFile, it will create a 
bufferd version of contained bitmap now automatically
 GDIMetaFile aMtf(pObj->GetGraphic()->GetGDIMetaFile());
 SvMemoryStream aDestStrm( 65535, 65535 );
-ConvertGDIMetaFileToWMF( aMtf, aDestStrm, NULL, sal_False 
);
+

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

2013-06-06 Thread Lionel Elie Mamane

 wizards/com/sun/star/wizards/report/ReportWizard.java |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b0778c7f89c06e4bb8f24bb252da4f5667c22918
Author: Lionel Elie Mamane 
Date:   Thu Jun 6 19:32:24 2013 +0200

indentation

Change-Id: Ib2011a589c12b585c6045fdc87b08f711ed9edc6

diff --git a/wizards/com/sun/star/wizards/report/ReportWizard.java 
b/wizards/com/sun/star/wizards/report/ReportWizard.java
index 3e40f7b..bae9152 100644
--- a/wizards/com/sun/star/wizards/report/ReportWizard.java
+++ b/wizards/com/sun/star/wizards/report/ReportWizard.java
@@ -396,7 +396,7 @@ public class ReportWizard extends DatabaseObjectWizard 
implements XTextListener
 return false;
 }
 return e.hasMoreElements();
-}
+}
 
 /**
  * Return the path to the "com.sun.reportdesigner" extension
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: RepositoryExternal.mk solenv/gbuild

2013-06-06 Thread Riccardo Magliocchetti

 RepositoryExternal.mk|4 ++--
 solenv/gbuild/Gallery.mk |4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit b75fae74f7023d3cb78c6d1ecbcf019e020c3f56
Author: Riccardo Magliocchetti 
Date:   Thu Jun 6 18:52:57 2013 +0200

Don't require vclplug_svp with --enable-headless

Fixes build.

Change-Id: I4280cc26acd2278003f3bdee641a3168b01e17cb

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 4fcdf4b..dd48feb 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2971,9 +2971,9 @@ $(call gb_Executable_add_runtime_dependencies,$(1),\
$(call gb_Configuration_get_target,registry) \
$(call gb_Configuration_get_target,fcfg_langpack) \
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
-   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)), \
+   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, 
\
$(call gb_Library_get_target,vclplug_svp) \
-   ) \
+   )) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
$(call gb_UnoApi_get_target,offapi) \
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 0273b50..5ce7a6b 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -59,7 +59,9 @@ $(call gb_Output_announce,$(2),$(true),GAL,1)
 $(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
$(call gb_Helper_print_on_error,\
-   $(if $(filter-out MACOSX 
WNT,$(OS_FOR_BUILD)),SAL_USE_VCLPLUGIN=svp) \
+   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if 
$(ENABLE_HEADLESS),, \
+   SAL_USE_VCLPLUGIN=svp \
+   )) \
$(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
$(call gb_Gallery__make_env_args) \
--build-tree \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Luboš Luňák

 sw/source/core/doc/number.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 44c133ef996e32ebdfc9560bcf14b0cd77196a9e
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Thu Jun 6 19:36:09 2013 +0200

OpenSymbol is a symbol font

Change-Id: I2489b836950db63f5f53f8a272970b7769c29282

diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index e028eb2..9e5be22 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1278,6 +1278,7 @@ namespace numfunc
 mpFont = new Font( msFontname, aEmptyStr, Size( 0, 14 ) );
 mpFont->SetWeight( meFontWeight );
 mpFont->SetItalic( meFontItalic );
+mpFont->SetCharSet( RTL_TEXTENCODING_SYMBOL );
 }
 
 void SwDefBulletConfig::Notify( const uno::Sequence& )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: gerritbot/send-daily-digest

2013-06-06 Thread Bjoern Michaelsen

 gerritbot/send-daily-digest |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit a2cb86dfa92cb8992c45c9f896cc1056a9a7
Author: Bjoern Michaelsen 
Date:   Thu Jun 6 19:58:29 2013 +0200

self-referencing ftw

diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest
index 90274bc..f8273c2 100755
--- a/gerritbot/send-daily-digest
+++ b/gerritbot/send-daily-digest
@@ -54,7 +54,10 @@ X-Mailer: LibreOfficeGerritDigestMailer 1.0
 
 Best,
 
-Your friendly LibreOffice Gerrit Digest Mailer'''
+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'''
 return message
 
 if __name__ == '__main__':
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Luboš Luňák

 sw/source/core/doc/number.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit d420c713f25b619e64be59d1310300692d0a1638
Author: LuboÅ¡ LuÅÃ¡k 
Date:   Thu Jun 6 19:36:09 2013 +0200

OpenSymbol is a symbol font

Change-Id: I2489b836950db63f5f53f8a272970b7769c29282

diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index e028eb2..9e5be22 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1278,6 +1278,7 @@ namespace numfunc
 mpFont = new Font( msFontname, aEmptyStr, Size( 0, 14 ) );
 mpFont->SetWeight( meFontWeight );
 mpFont->SetItalic( meFontItalic );
+mpFont->SetCharSet( RTL_TEXTENCODING_SYMBOL );
 }
 
 void SwDefBulletConfig::Notify( const uno::Sequence& )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - sc/inc sc/source

2013-06-06 Thread Akash Shetye

 sc/inc/dbdataformatting.hxx  |   49 +
 sc/source/core/tool/dbdataformatting.cxx |   89 +++
 2 files changed, 138 insertions(+)

New commits:
commit 8fa7417df19079ea30382fb85bcb672025b445ff
Author: Akash Shetye 
Date:   Thu Jun 6 12:19:51 2013 +0530

Adds formatting class to hold stylesheet names for alternating rows and 
cols.

ScDBDataFormatting is added to hold the style sheet names for ScDBData's 
alternating rows and columns.

Change-Id: I3416f8cc56bf0a2afd7fde17039dc17bb6743a55
Reviewed-on: https://gerrit.libreoffice.org/4178
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/inc/dbdataformatting.hxx b/sc/inc/dbdataformatting.hxx
new file mode 100644
index 000..d1897ad
--- /dev/null
+++ b/sc/inc/dbdataformatting.hxx
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+#ifndef SC_DBDATAFORMATTING_HXX
+#define SC_DBDATAFORMATTING_HXX
+
+#include "rtl/ustring.hxx"
+
+class ScDBDataFormatting
+{
+private:
+OUString maFirstRowStripeStyle;
+OUString maSecondRowStripeStyle;
+OUString maFirstColStripeStyle;
+OUString maSecondColStripeStyle;
+bool bBandedRows;
+bool bBandedColumns;
+public:
+ScDBDataFormatting(const OUString& rFirstRowStripeStyle, const 
OUString& rSecondRowStripeStyle, const OUString& rFirstColStripeStyle, const 
OUString& rSecondColStripeStyle);
+void SetBandedRows( bool bBRows );
+bool GetBandedRows();
+void SetBandedColumns( bool bBCols );
+bool GetBandedColumns();
+const OUString& GetFirstRowStripeStyle() const;
+const OUString& GetSecondRowStripeStyle() const;
+const OUString& GetFirstColStripeStyle() const;
+const OUString& GetSecondColStripeStyle() const;
+void SetFirstRowStripeStyle( const OUString& aStyleName );
+void SetSecondRowStripeStyle( const OUString& aStyleName );
+void SetFirstColStripeStyle( const OUString& aStyleName );
+void SetSecondColStripeStyle( const OUString& aStyleName );
+};
+
+#endif
diff --git a/sc/source/core/tool/dbdataformatting.cxx 
b/sc/source/core/tool/dbdataformatting.cxx
new file mode 100644
index 000..1a84eb0
--- /dev/null
+++ b/sc/source/core/tool/dbdataformatting.cxx
@@ -0,0 +1,89 @@
+/* -*- 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 "dbdataformatting.hxx"
+#include "rtl/ustring.hxx"
+
+ScDBDataFormatting::ScDBDataFormatting(const OUString& rFirstRowStripeStyle, 
const OUString& rSecondRowStripeStyle, const OUString& rFirstColStripeStyle, 
const OUString& rSecondColStripeStyle) :
+maFirstRowStripeStyle( rFirstRowStripeStyle),
+maSecondRowStripeStyle   ( rSecondRowStripeStyle ),
+maFirstColStripeStyle( rFirstColStripeStyle ),
+maSecondColStripeStyle   ( rSecondColStripeStyle )
+{
+}
+
+void ScDBDataFormatting::SetBandedRows( bool bBRows )
+{
+bBandedRows = bBRows;
+}
+
+bool ScDBDataFormatting::GetBandedRows()
+{
+return bBandedRows;
+}
+
+void ScDBDataFormatting::SetBandedColumns( bool bBCols )
+{
+bBandedColumns = bBCols;
+}
+
+bool ScDBDataFormatting::GetBandedColumns()
+{
+return bBandedColumns;
+}
+
+const OUString& ScDBDataFo

[Libreoffice-commits] core.git: Branch 'feature/gsoc-calc-enhanced-db-range' - sc/inc sc/Library_sc.mk sc/source

2013-06-06 Thread Akash Shetye

 sc/Library_sc.mk |1 +
 sc/inc/dbdata.hxx|7 +++
 sc/inc/dbdataformatting.hxx  |4 ++--
 sc/source/core/tool/dbdata.cxx   |   11 +++
 sc/source/core/tool/dbdataformatting.cxx |   22 +-
 5 files changed, 38 insertions(+), 7 deletions(-)

New commits:
commit 9d616c2c56f0bea63d4252ce8c0980a17903361b
Author: Akash Shetye 
Date:   Thu Jun 6 17:45:05 2013 +0530

Adds get ans set methods in ScDBData for setting table formatting.

Some changes made in ScDBDataFormatting like adding a copy constructor, 
changes to the constructor etc. as well.

Change-Id: Ia9799a0cf4b449bfa04092772bea7f28cce1d7cb
Reviewed-on: https://gerrit.libreoffice.org/4179
Reviewed-by: Markus Mohrhard 
Tested-by: Markus Mohrhard 

diff --git a/sc/Library_sc.mk b/sc/Library_sc.mk
index 373ba8a..7a9e142 100644
--- a/sc/Library_sc.mk
+++ b/sc/Library_sc.mk
@@ -190,6 +190,7 @@ $(eval $(call gb_Library_add_exception_objects,sc,\
sc/source/core/tool/compiler \
sc/source/core/tool/consoli  \
sc/source/core/tool/dbdata \
+sc/source/core/tool/dbdataformatting \
sc/source/core/tool/ddelink \
sc/source/core/tool/defaultsoptions \
sc/source/core/tool/detdata  \
diff --git a/sc/inc/dbdata.hxx b/sc/inc/dbdata.hxx
index fcd5d49..a16e11f 100644
--- a/sc/inc/dbdata.hxx
+++ b/sc/inc/dbdata.hxx
@@ -24,6 +24,7 @@
 #include "refreshtimer.hxx"
 #include "address.hxx"
 #include "global.hxx"
+#include "dbdataformatting.hxx"
 
 #include 
 #include 
@@ -42,6 +43,7 @@ private:
 boost::scoped_ptr mpQueryParam;
 boost::scoped_ptr mpSubTotal;
 boost::scoped_ptr mpImportParam;
+boost::scoped_ptr mpTableFormatData;
 
 // DBParam
 const OUString aName;
@@ -123,6 +125,11 @@ public:
 voidGetImportParam(ScImportParam& rImportParam) const;
 voidSetImportParam(const ScImportParam& rImportParam);
 
+//The getter and setter methods for mpTableFormatData will be called
+//From the alternating coloring dialog hence SC_DLLPUBLIC.
+SC_DLLPUBLIC voidSetTableFormatting( const ScDBDataFormatting& 
rTableFormatData );
+SC_DLLPUBLIC voidGetTableFormatting( ScDBDataFormatting& 
rTableFormatData ) const;
+
 boolIsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool 
bStartOnly) const;
 boolIsDBAtArea(SCTAB nTab, SCCOL nCol1, SCROW nRow1, SCCOL nCol2, 
SCROW nRow2) const;
 
diff --git a/sc/inc/dbdataformatting.hxx b/sc/inc/dbdataformatting.hxx
index d1897ad..aa3bd65 100644
--- a/sc/inc/dbdataformatting.hxx
+++ b/sc/inc/dbdataformatting.hxx
@@ -23,7 +23,6 @@
 
 class ScDBDataFormatting
 {
-private:
 OUString maFirstRowStripeStyle;
 OUString maSecondRowStripeStyle;
 OUString maFirstColStripeStyle;
@@ -31,7 +30,8 @@ class ScDBDataFormatting
 bool bBandedRows;
 bool bBandedColumns;
 public:
-ScDBDataFormatting(const OUString& rFirstRowStripeStyle, const 
OUString& rSecondRowStripeStyle, const OUString& rFirstColStripeStyle, const 
OUString& rSecondColStripeStyle);
+ScDBDataFormatting(const OUString& rFirstRowStripeStyle, const 
OUString& rSecondRowStripeStyle, const OUString& rFirstColStripeStyle, const 
OUString& rSecondColStripeStyle, bool bBRows, bool bBCols);
+ScDBDataFormatting( const ScDBDataFormatting& rTableFormatData );
 void SetBandedRows( bool bBRows );
 bool GetBandedRows();
 void SetBandedColumns( bool bBCols );
diff --git a/sc/source/core/tool/dbdata.cxx b/sc/source/core/tool/dbdata.cxx
index 163e6fe..33aece7 100644
--- a/sc/source/core/tool/dbdata.cxx
+++ b/sc/source/core/tool/dbdata.cxx
@@ -407,6 +407,17 @@ void ScDBData::SetImportParam(const ScImportParam& 
rImportParam)
 mpImportParam.reset(new ScImportParam(rImportParam));
 }
 
+//Methods to get and set ScDBDataFormatting instance
+void ScDBData::SetTableFormatting( const ScDBDataFormatting& rTableFormatData )
+{
+mpTableFormatData.reset( new ScDBDataFormatting( rTableFormatData ) );
+}
+
+void ScDBData::GetTableFormatting( ScDBDataFormatting& rTableFormatData ) const
+{
+rTableFormatData = *mpTableFormatData;
+}
+
 bool ScDBData::IsDBAtCursor(SCCOL nCol, SCROW nRow, SCTAB nTab, bool 
bStartOnly) const
 {
 if (nTab == nTable)
diff --git a/sc/source/core/tool/dbdataformatting.cxx 
b/sc/source/core/tool/dbdataformatting.cxx
index 1a84eb0..c398883 100644
--- a/sc/source/core/tool/dbdataformatting.cxx
+++ b/sc/source/core/tool/dbdataformatting.cxx
@@ -20,11 +20,23 @@
 #include "dbdataformatting.hxx"
 #include "rtl/ustring.hxx"
 
-ScDBDataFormatting::ScDBDataFormatting(const OUString& rFirstRowStripeStyle, 
const OUString& rSecondRowStripeStyle, const OUString& rFirstColStripeStyle, 
const OUString& rSecondColStripeStyle) :
-maFirstRowStripeStyle( rFirstRowStripeStyle),
-maSecondRowStripeStyle   ( rSecondRowStripeStyle ),
-maFirs

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - RepositoryFixes.mk solenv/gbuild solenv/inc

2013-06-06 Thread Herbert Dürr

 RepositoryFixes.mk  |6 +++---
 solenv/gbuild/gbuild.mk |1 -
 solenv/inc/wntmsci11.mk |1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 2a8050f9e28c97d08f6b8684c0a091a9160c2874
Author: Herbert DÃ¼rr 
Date:   Thu Jun 6 16:52:50 2013 +

#i122378# fix build of dbgutil-enabled static libraries on Windows

diff --git a/solenv/inc/wntmsci11.mk b/solenv/inc/wntmsci11.mk
index 2338c9a..93c8222 100644
--- a/solenv/inc/wntmsci11.mk
+++ b/solenv/inc/wntmsci11.mk
@@ -292,7 +292,6 @@ LIBCMT=msvcrt.lib
 .ELSE # "$(DYNAMIC_CRT)"!=""
 .IF "$(USE_STLP_DEBUG)" != ""
 LIBCMT=libcmt.lib
-CDEFS+=-D_DEBUG
 .ELSE  # "$(USE_STLP_DEBUG)" != ""
 LIBCMT=libcmt.lib
 .ENDIF # "$(USE_STLP_DEBUG)" != ""
commit d54c8fadb01519d1bbfcfa4669cb128745c5c2c0
Author: Herbert DÃ¼rr 
Date:   Thu Jun 6 16:41:46 2013 +

#i122378# fix dbgutil-enabled gbuild of modules on Windows

gbuild modules should use the same crt-libs and crt-options as dmake modules

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 22d5406..4d8ec80 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -165,9 +165,9 @@ gb_Library_NOILIBFILENAMES:=\
 
 gb_Library_FILENAMES := $(filter-out $(foreach 
lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES += $(foreach 
lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
-ifneq ($(gb_PRODUCT),$(true))
-gb_Library_FILENAMES := $(patsubst 
msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES))
-endif
+#ifneq ($(gb_PRODUCT),$(true))
+#gb_Library_FILENAMES := $(patsubst 
msvcrt:msvcrt%,msvcrt:msvcrtd%,$(gb_Library_FILENAMES))
+#endif
 
 gb_Library_DLLFILENAMES := $(patsubst 
comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst 
icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 6205687..848ced3 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -177,7 +177,6 @@ else
 gb_GLOBALDEFS += \
-DDBG_UTIL \
-D_STLP_DEBUG \
-   -D_DEBUG \
 
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Julien Nabet

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

New commits:
commit 3aeffe1c16f6592d60681c4241054991d0d6a0e8
Author: Julien Nabet 
Date:   Thu Jun 6 20:18:51 2013 +0200

Typo

Change-Id: Iced1dfba37c155c64dc0488fdb1b0d50e20b25c4

diff --git a/configure.ac b/configure.ac
index a00c317..999db29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -769,7 +769,7 @@ AC_ARG_ENABLE(odk,
 
 AC_ARG_ENABLE(mpl-subset,
 AS_HELP_STRING([--enable-mpl-subset],
-[Don't compile any pieces which are not MPL or more liberrally 
licensed])
+[Don't compile any pieces which are not MPL or more liberally 
licensed])
 )
 
 AC_ARG_ENABLE(evolution2,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - d5/4c8fadb01519d1bbfcfa4669cb128745c5c2c0

2013-06-06 Thread Michael Stahl

 d5/4c8fadb01519d1bbfcfa4669cb128745c5c2c0 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit cf720bc0fb44ce5f9b1ee5cc0d0cdd94e8478a6b
Author: Michael Stahl 
Date:   Thu Jun 6 21:01:01 2013 +0200

Notes added by 'git notes add'

diff --git a/d5/4c8fadb01519d1bbfcfa4669cb128745c5c2c0 
b/d5/4c8fadb01519d1bbfcfa4669cb128745c5c2c0
new file mode 100644
index 000..4938872
--- /dev/null
+++ b/d5/4c8fadb01519d1bbfcfa4669cb128745c5c2c0
@@ -0,0 +1 @@
+reject: pry our MSVC debug runtimes from our cold dead hands
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2a/8050f9e28c97d08f6b8684c0a091a9160c2874

2013-06-06 Thread Michael Stahl

 2a/8050f9e28c97d08f6b8684c0a091a9160c2874 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 974ef286aa5d436af2f6517adbf2472cda1fc107
Author: Michael Stahl 
Date:   Thu Jun 6 21:01:31 2013 +0200

Notes added by 'git notes add'

diff --git a/2a/8050f9e28c97d08f6b8684c0a091a9160c2874 
b/2a/8050f9e28c97d08f6b8684c0a091a9160c2874
new file mode 100644
index 000..4938872
--- /dev/null
+++ b/2a/8050f9e28c97d08f6b8684c0a091a9160c2874
@@ -0,0 +1 @@
+reject: pry our MSVC debug runtimes from our cold dead hands
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dev-tools.git: 2 commits - gerritbot/send-daily-digest

2013-06-06 Thread Bjoern Michaelsen

 gerritbot/send-daily-digest |   41 -
 1 file changed, 20 insertions(+), 21 deletions(-)

New commits:
commit 229be4ab7d8b18515ec507bac7fa3f76cee03b0d
Author: Bjoern Michaelsen 
Date:   Thu Jun 6 21:27:54 2013 +0200

proper time

diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest
index eede87b..e1e9c3f 100755
--- a/gerritbot/send-daily-digest
+++ b/gerritbot/send-daily-digest
@@ -10,6 +10,8 @@
 
 import argparse
 import datetime
+import time
+import email
 import email.mime.text
 import json
 import os
@@ -52,7 +54,7 @@ Note: The bot generating this message can be found and 
improved here:
 msg = email.mime.text.MIMEText(body, 'plain', 'UTF-8')
 msg['From'] = 'ger...@libreoffice.org'
 msg['To'] = 'libreoffice@lists.freedesktop.org'
-msg['Date'] = str(now)
+msg['Date'] = email.utils.formatdate(time.mktime((now.timetuple(
 msg['Subject'] = 'LibreOffice Gerrit News %s' % now.date().isoformat()
 msg['Reply-To'] = 'ibreoff...@lists.freedesktop.org'
 msg['X-Mailer'] = 'LibreOfficeGerritDigestMailer 1.0'
commit 05060611ed5df411887c153880752159e7618143
Author: Bjoern Michaelsen 
Date:   Thu Jun 6 21:24:28 2013 +0200

proper MIME and UTF-8

diff --git a/gerritbot/send-daily-digest b/gerritbot/send-daily-digest
index f8273c2..eede87b 100755
--- a/gerritbot/send-daily-digest
+++ b/gerritbot/send-daily-digest
@@ -9,9 +9,8 @@
 #
 
 import argparse
-import codecs
 import datetime
-import email
+import email.mime.text
 import json
 import os
 import sh
@@ -33,24 +32,16 @@ def get_digest(gerrit, query):
 
 def create_message(gerrit, age):
 now = datetime.datetime.now()
-message = '''From: ger...@libreoffice.org
-To: libreoffice@lists.freedesktop.org
-Date: %s
-Subject: LibreOffice Gerrit news %s
-Reply-To: libreoffice@lists.freedesktop.org
-X-Mailer: LibreOfficeGerritDigestMailer 1.0
-
-''' % (now, now.date().isoformat())
-message += 'Moin!\n\n'
-message += 'open changes on master for project core changed in the last %d 
hours:\n' % age
-message += get_digest(gerrit, get_daily_query('open', age))
-message += '\n\nmerged changes on master for project core changed in the 
last %d hours:\n' % age
-message += get_digest(gerrit, get_daily_query('merged', age))
-message += '\n\nabandoned changes on master for project core changed in 
the last %d hours:\n' % age
-message += get_digest(gerrit, get_daily_query('abandoned', age))
-message += '\n\nOpen changes needing tweaks, but being untouched for more 
than a week:\n'
-message += get_digest(gerrit, 'project:core branch:master status:open 
(label:Code-Review<=-1 label:Verified<=-1) age:1w')
-message += '''
+body = 'Moin!\n\n'
+body += 'open changes on master for project core changed in the last %d 
hours:\n' % age
+body += get_digest(gerrit, get_daily_query('open', age))
+body += '\n\nmerged changes on master for project core changed in the last 
%d hours:\n' % age
+body += get_digest(gerrit, get_daily_query('merged', age))
+body += '\n\nabandoned changes on master for project core changed in the 
last %d hours:\n' % age
+body += get_digest(gerrit, get_daily_query('abandoned', age))
+body += '\n\nOpen changes needing tweaks, but being untouched for more 
than a week:\n'
+body += get_digest(gerrit, 'project:core branch:master status:open 
(label:Code-Review<=-1 label:Verified<=-1) age:1w')
+body += '''
 
 Best,
 
@@ -58,7 +49,14 @@ 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'''
-return message
+msg = email.mime.text.MIMEText(body, 'plain', 'UTF-8')
+msg['From'] = 'ger...@libreoffice.org'
+msg['To'] = 'libreoffice@lists.freedesktop.org'
+msg['Date'] = str(now)
+msg['Subject'] = 'LibreOffice Gerrit News %s' % now.date().isoformat()
+msg['Reply-To'] = 'ibreoff...@lists.freedesktop.org'
+msg['X-Mailer'] = 'LibreOfficeGerritDigestMailer 1.0'
+return msg
 
 if __name__ == '__main__':
 parser = argparse.ArgumentParser('gerrit daily digest generator')
@@ -67,6 +65,5 @@ if __name__ == '__main__':
#server = smtplib.SMTP('localhost')
 #server.sendmail('ger...@libreoffice.org', 
'libreoffice@lists.freedesktop.org', str(message))
#server.quit()
-sys.stdout = codecs.getwriter("utf-8")(sys.stdout)
 print(create_message(args['gerrit'], 25))
 # vim: set et sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-06 Thread Miklos Vajna

 configure.ac  |2 +-
 sw/source/core/inc/frame.hxx  |2 +-
 sw/source/core/layout/layact.cxx  |2 +-
 sw/source/core/layout/pagechg.cxx |7 +--
 4 files changed, 4 insertions(+), 9 deletions(-)

New commits:
commit ed1a26565898a6461503468b1fba008328019055
Author: Miklos Vajna 
Date:   Thu Jun 6 19:59:04 2013 +0200

configure: --with-system-libs should imply --with-system-harfbuzz

Change-Id: I704f0e679382f6d4b08fcdda99337d2376c21fe3

diff --git a/configure.ac b/configure.ac
index 999db29..ff19a0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8388,7 +8388,7 @@ AC_MSG_CHECKING([whether to enable HarfBuzz support])
 if test "$_os" != "WINNT" -a "$_os" != "Darwin"; then
 AC_MSG_RESULT([yes])
 ENABLE_HARFBUZZ="TRUE"
-if test "$with_system_harfbuzz" = "yes"; then
+if test "$with_system_harfbuzz" = "yes" -o "$with_system_libs" = "yes"; 
then
if $PKG_CONFIG --atleast-version 0.9.18 harfbuzz; then
libo_CHECK_SYSTEM_MODULE([harfbuzz],[HARFBUZZ],[harfbuzz-icu >= 
0.9.18])
else
commit 97035c95c27b34313eadd09692804045f67f440a
Author: Miklos Vajna 
Date:   Thu Jun 6 20:12:56 2013 +0200

Revert "bnc#382137 SwFrm::CheckPageDescs: notify clients about deleted 
SwPageFrm"

I can't reprodue this in a product build and I'm not sure this was the
right fix for the problem.

This reverts commit bb4d5d96f4daf1dc1b92f823171ac567f6cf95a8.

diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 7d91e79..f93ae67 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -588,7 +588,7 @@ public:
 inline void SetFixSize( sal_Bool bNew ) { mbFixSize = bNew; }
 
 // check all pages (starting from the given) and correct them if needed
-static void CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields = 
sal_True, SwPageFrm** ppPrev = 0);
+static void CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields = 
sal_True );
 
 // might return 0, with and without const
 SwFrm   *GetNext()  { return mpNext; }
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index 37c77f4..71659ce 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -562,7 +562,7 @@ void SwLayAction::InternalAction()
 SwPageFrm *pTmp = pPage->GetPrev() ?
 (SwPageFrm*)pPage->GetPrev() : pPage;
 SetCheckPages( sal_True );
-SwFrm::CheckPageDescs( pPage, sal_True, &pTmp );
+SwFrm::CheckPageDescs( pPage );
 SetCheckPages( sal_False );
 nCheckPageNum = USHRT_MAX;
 pPage = pTmp;
diff --git a/sw/source/core/layout/pagechg.cxx 
b/sw/source/core/layout/pagechg.cxx
index 1bf4522..304bbcb 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -1061,7 +1061,7 @@ void SwPageFrm::PrepareRegisterChg()
 |*  einfache zu bereinigen.
 |*
 |*/
-void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields, 
SwPageFrm** ppPrev )
+void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool bNotifyFields )
 {
 OSL_ENSURE( pStart, "Keine Startpage." );
 
@@ -1136,15 +1136,10 @@ void SwFrm::CheckPageDescs( SwPageFrm *pStart, sal_Bool 
bNotifyFields, SwPageFrm
 {
 SwPageFrm *pTmp = (SwPageFrm*)pPage->GetNext();
 pPage->Cut();
-bool bUpdatePrev = false;
-if (ppPrev && *ppPrev == pPage)
-bUpdatePrev = true;
 delete pPage;
 if ( pStart == pPage )
 pStart = pTmp;
 pPage = pTmp;
-if (bUpdatePrev)
-*ppPrev = pTmp;
 continue;
 }
 else if ( pPage->IsEmptyPage() && !pFmtWish &&  //2.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - RepositoryExternal.mk solenv/gbuild

2013-06-06 Thread Riccardo Magliocchetti

 RepositoryExternal.mk|4 ++--
 solenv/gbuild/Gallery.mk |4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 63a43711ac1e85b15f6912f568d0a5fb021da920
Author: Riccardo Magliocchetti 
Date:   Thu Jun 6 18:52:57 2013 +0200

Don't require vclplug_svp with --enable-headless

Fixes build.

Change-Id: I4280cc26acd2278003f3bdee641a3168b01e17cb

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 58c0fcd..2a1b2b3 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2889,9 +2889,9 @@ $(call gb_Executable_add_runtime_dependencies,$(1),\
$(call gb_Configuration_get_target,registry) \
$(call gb_Configuration_get_target,fcfg_langpack) \
$(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
-   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)), \
+   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if $(ENABLE_HEADLESS),, 
\
$(call gb_Library_get_target,vclplug_svp) \
-   ) \
+   )) \
$(call gb_Package_get_target_for_build,cppuhelper_unorc) \
$(call gb_Rdb_get_outdir_target_for_build,ure/services) \
$(call gb_UnoApi_get_target,offapi) \
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index 0273b50..5ce7a6b 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -59,7 +59,9 @@ $(call gb_Output_announce,$(2),$(true),GAL,1)
 $(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
$(call gb_Helper_print_on_error,\
-   $(if $(filter-out MACOSX 
WNT,$(OS_FOR_BUILD)),SAL_USE_VCLPLUGIN=svp) \
+   $(if $(filter-out MACOSX WNT,$(OS_FOR_BUILD)),$(if 
$(ENABLE_HEADLESS),, \
+   SAL_USE_VCLPLUGIN=svp \
+   )) \
$(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
$(call gb_Gallery__make_env_args) \
--build-tree \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - be/44a7a90ab5428ccdc924684dad463b36a8be48

2013-06-06 Thread Caolán McNamara

 be/44a7a90ab5428ccdc924684dad463b36a8be48 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 155b18c338b781149194dcfa70e76fac74d7c94e
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 20:51:07 2013 +0100

Notes added by 'git notes add'

diff --git a/be/44a7a90ab5428ccdc924684dad463b36a8be48 
b/be/44a7a90ab5428ccdc924684dad463b36a8be48
new file mode 100644
index 000..0a69729
--- /dev/null
+++ b/be/44a7a90ab5428ccdc924684dad463b36a8be48
@@ -0,0 +1 @@
+prefer: d26f3acf2874f64fd89c8197163651443d4b1733
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 81/664c037c8d6094b66c1660b6eee9693eadf401

2013-06-06 Thread Caolán McNamara

 81/664c037c8d6094b66c1660b6eee9693eadf401 |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4253d243851b3a0cdd8f42be363a29ac731ebfad
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 6 21:04:18 2013 +0100

Notes added by 'git notes add'

diff --git a/81/664c037c8d6094b66c1660b6eee9693eadf401 
b/81/664c037c8d6094b66c1660b6eee9693eadf401
new file mode 100644
index 000..91a7b27
--- /dev/null
+++ b/81/664c037c8d6094b66c1660b6eee9693eadf401
@@ -0,0 +1 @@
+merged as: c0eb5e7772c848806db8ab461f77f9549c1d8b2b
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 >

1 - 100 of 121 matches

Mail list logo