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

2017-12-01 Thread Stephan Bergmann 
 reportdesign/source/filter/xml/xmlfilter.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 719f2e8462faf102f780fd2cfa932c84a776bbc6
Author: Stephan Bergmann 
Date:   Fri Dec 1 09:02:12 2017 +0100

-Werror,-Wimplicit-fallthrough

Change-Id: I9aae6c5689db2b13830915b683baa8667dfe1068

diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx 
b/reportdesign/source/filter/xml/xmlfilter.cxx
index b7223bd0ef0d..bf246129d9e3 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -714,6 +714,7 @@ public:
 break;
 case XML_TOK_CONTENT_BODY:
 pContext = new RptXMLDocumentBodyContext(rImport, nPrefix, 
rLocalName);
+break;
 default:
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-26 Thread Caolán McNamara 
 reportdesign/source/ui/inc/dlgedfac.hxx|2 +-
 reportdesign/source/ui/report/dlgedfac.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8c99d76144b550b17810135418d1c2f12ef8f138
Author: Caolán McNamara 
Date:   Sun Nov 26 21:31:06 2017 +

coverity#1421074 Uncaught exception

Change-Id: Id3decb150cfa2d994208c79f9d015d21d351f987

diff --git a/reportdesign/source/ui/inc/dlgedfac.hxx 
b/reportdesign/source/ui/inc/dlgedfac.hxx
index a75315fdd3df..f35d657575d6 100644
--- a/reportdesign/source/ui/inc/dlgedfac.hxx
+++ b/reportdesign/source/ui/inc/dlgedfac.hxx
@@ -33,7 +33,7 @@ class DlgEdFactory
 {
 public:
 DlgEdFactory();
-~DlgEdFactory();
+~DlgEdFactory() COVERITY_NOEXCEPT_FALSE;
 
 DECL_STATIC_LINK( DlgEdFactory, MakeObject, SdrObjCreatorParams, 
SdrObject* );
 };
diff --git a/reportdesign/source/ui/report/dlgedfac.cxx 
b/reportdesign/source/ui/report/dlgedfac.cxx
index 823e2b315685..1a59852f1029 100644
--- a/reportdesign/source/ui/report/dlgedfac.cxx
+++ b/reportdesign/source/ui/report/dlgedfac.cxx
@@ -37,7 +37,7 @@ DlgEdFactory::DlgEdFactory()
 }
 
 
-DlgEdFactory::~DlgEdFactory()
+DlgEdFactory::~DlgEdFactory() COVERITY_NOEXCEPT_FALSE
 {
 SdrObjFactory::RemoveMakeObjectHdl( LINK(this, DlgEdFactory, MakeObject) );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-04 Thread Julien Nabet 
 reportdesign/source/core/inc/Functions.hxx |4 ++--
 reportdesign/source/core/inc/Groups.hxx|4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9be866ac6a97ae7d45d039b9f5bb19064afdc038
Author: Julien Nabet 
Date:   Sat Nov 4 18:23:17 2017 +0100

Replace lists by vectors in reportdesign

Change-Id: I67472484d83ee75cbcc50a64b4637d3b45608499
Reviewed-on: https://gerrit.libreoffice.org/44309
Reviewed-by: Noel Grandin 
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/reportdesign/source/core/inc/Functions.hxx 
b/reportdesign/source/core/inc/Functions.hxx
index 0eb61ea04037..84a35bc5e285 100644
--- a/reportdesign/source/core/inc/Functions.hxx
+++ b/reportdesign/source/core/inc/Functions.hxx
@@ -25,7 +25,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 
 namespace reportdesign
@@ -38,7 +38,7 @@ namespace reportdesign
 class OFunctions : public cppu::BaseMutex,
 public FunctionsBase
 {
-typedef ::std::list< css::uno::Reference< css::report::XFunction > >  
TFunctions;
+typedef ::std::vector< css::uno::Reference< css::report::XFunction > > 
 TFunctions;
 ::comphelper::OInterfaceContainerHelper2
m_aContainerListeners;
 css::uno::Reference< css::uno::XComponentContext >
m_xContext;
 css::uno::WeakReference< css::report::XFunctionsSupplier >
m_xParent;
diff --git a/reportdesign/source/core/inc/Groups.hxx 
b/reportdesign/source/core/inc/Groups.hxx
index 248dd725f515..82dcb82bf83b 100644
--- a/reportdesign/source/core/inc/Groups.hxx
+++ b/reportdesign/source/core/inc/Groups.hxx
@@ -24,7 +24,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 
 namespace reportdesign
@@ -37,7 +37,7 @@ namespace reportdesign
 class OGroups : public cppu::BaseMutex,
 public GroupsBase
 {
-typedef ::std::list< css::uno::Reference< css::report::XGroup > > 
TGroups;
+typedef ::std::vector< css::uno::Reference< css::report::XGroup > > 
TGroups;
 ::comphelper::OInterfaceContainerHelper2
m_aContainerListeners;
 css::uno::Reference< css::uno::XComponentContext >
m_xContext;
 css::uno::WeakReference< css::report::XReportDefinition > 
m_xParent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-10-03 Thread Noel Grandin 
 reportdesign/source/ui/report/ReportSection.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 8481019c8c57459494b931aeec0915317204a05b
Author: Noel Grandin 
Date:   Tue Oct 3 11:35:55 2017 +0200

tdf#112848 Assert when clicking on report wizard or design view

the StartListening call here is unnecessary because OSectionView
inherits from SdrMarkView which calls StartListening unconditionally in
it's constructor.

Change-Id: I0191fce12e0600cc8fc6b9cc20e7e3bf39b386d3
Reviewed-on: https://gerrit.libreoffice.org/43070
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/reportdesign/source/ui/report/ReportSection.cxx 
b/reportdesign/source/ui/report/ReportSection.cxx
index 81eab1451313..d857c215f155 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -229,7 +229,6 @@ void OReportSection::fill()
 
 m_pView->SetDesignMode();
 
-m_pView->StartListening( *m_pModel  );
 m_pPage->SetSize( Size( 
getStyleProperty(xReportDefinition,PROPERTY_PAPERSIZE).Width,5*m_xSection->getHeight())
 );
 const Size aPageSize = m_pPage->GetSize();
 m_pView->SetWorkArea( tools::Rectangle( Point( nLeftMargin, 0), 
Size(aPageSize.Width() - nLeftMargin - nRightMargin,aPageSize.Height()) ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-28 Thread Stephan Bergmann 
 reportdesign/source/core/api/FixedLine.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit dbb5a5a2f429b7d05a6e69ab17b0a3022a97ac64
Author: Stephan Bergmann 
Date:   Thu Sep 28 11:29:09 2017 +0200

Replace fancy Unicode in exception message

...with something more prosaic and ASCII

Change-Id: I4a927cec15abb7c00f39a6a298a13f192f34c631

diff --git a/reportdesign/source/core/api/FixedLine.cxx 
b/reportdesign/source/core/api/FixedLine.cxx
index 3b79e32d785f..e9aea2c5a936 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -510,11 +510,10 @@ awt::Size SAL_CALL OFixedLine::getSize(  )
 
 void SAL_CALL OFixedLine::setSize( const awt::Size& aSize )
 {
-const OUString hundredthmm(u"0\u2009\u00B5m"); // 0, thin space, µ 
(micro), m (meter)
 if ( aSize.Width < MIN_WIDTH && m_nOrientation == 1 )
-throw beans::PropertyVetoException("Too small width for FixedLine; 
minimum is "  + OUString::number(MIN_WIDTH)  + hundredthmm, 
static_cast(this));
+throw beans::PropertyVetoException("Too small width for FixedLine; 
minimum is "  + OUString::number(MIN_WIDTH)  + "0 micrometer", 
static_cast(this));
 else if ( aSize.Height < MIN_HEIGHT && m_nOrientation == 0 )
-throw beans::PropertyVetoException("Too small height for FixedLine; 
minimum is " + OUString::number(MIN_HEIGHT) + hundredthmm, 
static_cast(this));
+throw beans::PropertyVetoException("Too small height for FixedLine; 
minimum is " + OUString::number(MIN_HEIGHT) + "0 micrometer", 
static_cast(this));
 OShapeHelper::setSize(aSize,this);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-12 Thread Caolán McNamara 
 reportdesign/source/ui/inspection/GeometryHandler.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e609ac1e5ffe1a6882551660256d9625b630d346
Author: Caolán McNamara 
Date:   Tue Sep 12 09:31:40 2017 +0100

coverity#1078469 silence Unchecked return value

Change-Id: I5c7c6328deb1c71f3a1214a4847ea97ef853c0d5

diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx 
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 9d6ddce537ae..e1cb88d609b1 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1892,11 +1892,11 @@ bool GeometryHandler::impl_isDefaultFunction_nothrow( 
const uno::Reference< repo
 utl::TextSearch aTextSearch( aSearchOptions);
 sal_Int32 start = 0;
 sal_Int32 end = sFormula.getLength();
-if ( aTextSearch.SearchForward(sFormula,&start,&end) && start == 0 
&& end == sFormula.getLength()) // default function found
+if (aTextSearch.SearchForward(sFormula, &start, &end) && start == 
0 && end == sFormula.getLength()) // default function found
 {
 aSearchOptions.searchString = 
"\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]";
 utl::TextSearch aDataSearch( aSearchOptions);
-aDataSearch.SearchForward(sFormula,&start,&end );
+(void)aDataSearch.SearchForward(sFormula, &start, &end);
 ++start;
 _rDataField = sFormula.copy(start,end-start-1);
 _rsDefaultFunctionName = aIter->m_sName;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-10 Thread Jochen Nitschke 
 reportdesign/source/filter/xml/xmlfilter.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 2cd664b3d618e6085be8b44ee86eada6cd5f8789
Author: Jochen Nitschke 
Date:   Sun Sep 10 18:08:52 2017 +0200

cppcheck: knownConditionTrueFalse 'bRet' is always false

regression of commit 528632660b72b105345945c13c5b68060d94a91b
Date:   Thu Feb 9 08:52:13 2017 +0200
convert ErrCode to strong typedef

Change-Id: I5ce2b7d38c8d71ec40cc8de7c13e8aec637476b7
Reviewed-on: https://gerrit.libreoffice.org/42139
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx 
b/reportdesign/source/filter/xml/xmlfilter.cxx
index 0398bb51fe91..219593595726 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -559,8 +559,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue 
>& rDescriptor )
 }
 
 
-bRet = false;
-nRet = ERRCODE_NONE;
+bRet = nRet == ERRCODE_NONE;
 
 if ( bRet )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportdesign/source starmath/source stoc/source stoc/test svtools/source sw/inc sw/sdi sw/source

2017-08-28 Thread Johnny_M 
 reportdesign/source/ui/report/StartMarker.cxx |2 -
 starmath/source/dialog.cxx|2 -
 stoc/source/javavm/javavm.cxx |2 -
 stoc/test/testiadapter.cxx|   14 ++--
 stoc/test/testintrosp.cxx |2 -
 stoc/test/testintrosp.idl |4 +--
 stoc/test/testregistry.cxx|   30 +-
 svtools/source/contnr/treelist.cxx|2 -
 svtools/source/control/ctrlbox.cxx|4 +--
 svtools/source/control/ruler.cxx  |4 +--
 svtools/source/dialogs/prnsetup.cxx   |2 -
 svtools/source/misc/unitconv.cxx  |2 -
 svtools/source/svhtml/htmlout.cxx |4 +--
 svtools/source/svhtml/parhtml.cxx |4 +--
 svtools/source/svrtf/rtfout.cxx   |2 -
 sw/inc/IDocumentLinksAdministration.hxx   |2 -
 sw/inc/IDocumentTimerAccess.hxx   |2 -
 sw/inc/cmdid.h|2 -
 sw/inc/doc.hxx|2 -
 sw/inc/htmltbl.hxx|2 -
 sw/inc/swtable.hxx|1 
 sw/inc/swtypes.hxx|2 -
 sw/sdi/_basesh.sdi|   10 
 sw/sdi/_frmsh.sdi |6 ++---
 sw/sdi/_textsh.sdi|2 -
 sw/sdi/wbasesh.sdi|3 --
 sw/source/core/crsr/crsrsh.cxx|2 -
 sw/source/core/crsr/crstrvl.cxx   |4 +--
 sw/source/core/crsr/pam.cxx   |2 -
 sw/source/core/doc/docredln.cxx   |2 -
 sw/source/core/docnode/nodes.cxx  |6 ++---
 sw/source/core/edit/editsh.cxx|2 -
 sw/source/core/fields/docufld.cxx |2 -
 sw/source/core/frmedt/fefly1.cxx  |2 -
 sw/source/core/frmedt/feshview.cxx|8 +++---
 sw/source/core/frmedt/tblsel.cxx  |2 -
 sw/source/core/inc/swblocks.hxx   |2 -
 sw/source/core/inc/tblrwcl.hxx|2 -
 sw/source/core/layout/pagechg.cxx |4 +--
 sw/source/core/layout/paintfrm.cxx|2 -
 sw/source/core/layout/tabfrm.cxx  |2 -
 sw/source/core/table/swtable.cxx  |2 -
 sw/source/core/text/itrtxt.cxx|2 -
 sw/source/core/text/portxt.cxx|2 -
 sw/source/core/text/txtdrop.cxx   |2 -
 sw/source/core/text/txtfly.cxx|2 -
 sw/source/core/txtnode/txtedt.cxx |2 -
 sw/source/core/unocore/unosect.cxx|2 -
 sw/source/core/unocore/unotext.cxx|2 -
 sw/source/core/view/viewsh.cxx|2 -
 sw/source/core/view/vprint.cxx|2 -
 sw/source/filter/basflt/fltshell.cxx  |2 -
 sw/source/filter/html/htmlcss1.cxx|2 -
 sw/source/filter/html/htmlctxt.cxx|2 -
 sw/source/filter/html/htmlgrin.cxx|4 +--
 sw/source/filter/html/htmlsect.cxx|2 -
 sw/source/filter/html/htmltab.cxx |2 -
 sw/source/filter/html/swhtml.cxx  |2 -
 sw/source/filter/ww8/wrtw8sty.cxx |6 ++---
 sw/source/filter/ww8/wrtww8.cxx   |4 +--
 sw/source/filter/ww8/ww8atr.cxx   |2 -
 sw/source/filter/ww8/ww8par.cxx   |2 -
 sw/source/filter/ww8/ww8par.hxx   |2 -
 sw/source/filter/ww8/ww8par3.cxx  |2 -
 sw/source/filter/ww8/ww8par5.cxx  |4 +--
 sw/source/filter/ww8/ww8par6.cxx  |2 -
 sw/source/filter/ww8/ww8scan.cxx  |6 ++---
 sw/source/filter/ww8/ww8struc.hxx |2 -
 sw/source/filter/xml/xmlimp.cxx   |2 -
 sw/source/filter/xml/xmltbli.cxx  |6 ++---
 sw/source/ui/frmdlg/column.cxx|2 -
 sw/source/uibase/config/viewopt.cxx   |4 +--
 sw/source/uibase/dochdl/swdtflvr.cxx  |2 -
 sw/source/uibase/docvw/edtwin2.cxx|2 -
 sw/source/uibase/frmdlg/colmgr.cxx|8 +++---
 sw/source/uibase/frmdlg/frmmgr.cxx|4 +--
 sw/source/uibase/ribbar/inputwin.cxx  |4 +--
 sw/source/uibase/uiview/scroll.cxx|2 -
 78 files changed, 130 insertions(+), 132 deletions(-)

New commits:
commit 06c07c0dc15348c23fe432e7f1c0243486d1e6bf
Author: Johnny_M 
Date:   Sat Aug 26 01:03:43 2017 +0200

Translate German comments/debug strings (leftovers in dirs starmath to 
sysui)

Translates leftovers found using a custom regex.

Additionally translated:
- One randomly found comment in /reportdesign
- Test strings in /stoc/test (let's see if it works)

Change-Id: I5f893c194c4b56b5365700928a3b8b63936d03e2
Reviewed-

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

2017-08-06 Thread Jochen Nitschke 
 reportdesign/source/filter/xml/xmlfilter.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit 7b385595842b103ce6c990e6be5b9f18f2abdf7e
Author: Jochen Nitschke 
Date:   Sun Aug 6 22:30:58 2017 +0200

cppcheck: variableScope

value unused since commit d5630adf33cc7d30a657e789e2bf0978028e0c1f
 loplugin:checkunusedparams in various

Change-Id: I76c9a89f6fe15fbfce92f0d5578fd533325cb72b
Reviewed-on: https://gerrit.libreoffice.org/40813
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx 
b/reportdesign/source/filter/xml/xmlfilter.cxx
index e4f629fe6a0a..4106cdfc72b2 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -192,7 +192,6 @@ ErrCode ReadThroughComponent(
 if ( xStorage.is() )
 {
 uno::Reference< io::XStream > xDocStream;
-bool bEncrypted = false;
 
 try
 {
@@ -215,9 +214,6 @@ ErrCode ReadThroughComponent(
 
 // get input stream
 xDocStream = xStorage->openStreamElement( sStreamName, 
embed::ElementModes::READ );
-
-uno::Reference< beans::XPropertySet > xProps( xDocStream, 
uno::UNO_QUERY_THROW );
-xProps->getPropertyValue("Encrypted") >>= bEncrypted;
 }
 catch (const packages::WrongPasswordException&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-07-11 Thread Eike Rathke 
 reportdesign/source/ui/inc/Formula.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4f41e8810d67bd3d82e1ff40b23a9131921674a2
Author: Eike Rathke 
Date:   Tue Jul 11 11:21:18 2017 +0200

Add missing override

Change-Id: I233c84706916bfe3915e31deb8d41b3b377b7d98

diff --git a/reportdesign/source/ui/inc/Formula.hxx 
b/reportdesign/source/ui/inc/Formula.hxx
index ceba75141964..39cd6e92d246 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -74,7 +74,7 @@ public:
 virtual void notifyChange() override;
 virtual void fill() override;
 virtual bool calculateValue(const OUString& _sExpression, OUString& 
_rResult, bool bMatrixFormula) override;
-virtual std::shared_ptr getCompiler() const;
+virtual std::shared_ptr getCompiler() const 
override;
 virtual void doClose(bool _bOk) override;
 virtual void insertEntryToLRUList(const formula::IFunctionDescription*  
pDesc) override;
 virtual void showReference(const OUString& _sFormula) override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-07-04 Thread Michael Stahl 
 reportdesign/source/ui/misc/FunctionHelper.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4a77a818e0df010adcbefdcee0453ce0b16c0400
Author: Michael Stahl 
Date:   Tue Jul 4 14:56:18 2017 +0200

reportdesign: -Werror,-Wc++1z-extensions

static_assert with no message is a C++1z extension

Change-Id: I90750252a5c0b856d74ca0ef3f999d457a9bb8be

diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx 
b/reportdesign/source/ui/misc/FunctionHelper.cxx
index 349bc8d48061..9c9c7450f03e 100644
--- a/reportdesign/source/ui/misc/FunctionHelper.cxx
+++ b/reportdesign/source/ui/misc/FunctionHelper.cxx
@@ -219,7 +219,8 @@ sal_uInt32 FunctionDescription::getVarArgsStart() const
 // stability, ie. old code using the old VAR_ARGS and PAIRED_VAR_ARGS
 // values must still be handled. It is *not* sufficient to simply change
 // the values here.
-static_assert(nVarArgs30 == VAR_ARGS && nPairedVarArgs60 == 
PAIRED_VAR_ARGS);
+static_assert(nVarArgs30 == VAR_ARGS && nPairedVarArgs60 == 
PAIRED_VAR_ARGS,
+"VAR_ARGS or PAIRED_VAR_ARGS has unexpected value");
 if (nLen >= nPairedVarArgs60)
 nLen -= nPairedVarArgs60;
 else if (nLen >= nVarArgs30)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-06-22 Thread Jens Carl 
 reportdesign/source/core/sdr/UndoEnv.cxx |2 +-
 reportdesign/source/ui/report/ReportControllerObserver.cxx   |2 +-
 sc/source/filter/inc/tool.h  |2 +-
 sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx |2 +-
 svtools/source/misc/imap.cxx |2 +-
 sw/source/core/frmedt/fecopy.cxx |2 +-
 sw/source/core/layout/atrfrm.cxx |2 +-
 sw/source/filter/ww8/wrtw8sty.cxx|2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit cbe7bdfd7c0fe474161e2d141d4dd5948e50c3da
Author: Jens Carl 
Date:   Thu Jun 22 07:14:26 2017 +

tdf#39468 Translate some random German comments/terms

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

diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx 
b/reportdesign/source/core/sdr/UndoEnv.cxx
index 2a15451094a1..ed3caaaba4a8 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -360,7 +360,7 @@ void SAL_CALL OXUndoEnvironment::elementInserted(const 
ContainerEvent& evt)
 SolarMutexGuard aSolarGuard;
 ::osl::MutexGuard aGuard( m_pImpl->m_aMutex );
 
-// neues Object zum lauschen
+// new listener object
 Reference< uno::XInterface >  xIface( evt.Element, UNO_QUERY );
 if ( !IsLocked() )
 {
diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx 
b/reportdesign/source/ui/report/ReportControllerObserver.cxx
index 662beca901e7..f20239c29869 100644
--- a/reportdesign/source/ui/report/ReportControllerObserver.cxx
+++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx
@@ -348,7 +348,7 @@ void SAL_CALL 
OXReportControllerObserver::elementInserted(const container::Conta
 SolarMutexGuard aSolarGuard;
 ::osl::MutexGuard aGuard( m_pImpl->m_aMutex );
 
-// neues Object zum lauschen
+// new listner object
 uno::Reference< uno::XInterface >  xIface( evt.Element, uno::UNO_QUERY );
 if ( xIface.is() )
 {
diff --git a/sc/source/filter/inc/tool.h b/sc/source/filter/inc/tool.h
index 08384c732767..c2a5b2bc62b7 100644
--- a/sc/source/filter/inc/tool.h
+++ b/sc/source/filter/inc/tool.h
@@ -116,7 +116,7 @@ inline const SfxUInt32Item* FormCache::GetAttr( sal_uInt8 
nFormat, sal_uInt8 nSt
 pRet = aIdents[ nIndex ].GetAttr();
 else
 {
-// neues Attribut anlegen
+// create new attribute
 pAttr = NewAttr( nFormat, nSt );
 OSL_ENSURE( pAttr, "FormCache::GetAttr(): Nothing to save" );
 
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx 
b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 4a76e4abb9f5..ee5e31ba3911 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -360,7 +360,7 @@ sal_Int32 ScNotesChildren::CheckChanges(const 
ScPreviewLocationData& rData,
 if (aNote.maNoteText == aItr->maNoteText)
 {
 aNote.mpTextHelper = aItr->mpTextHelper;
-if (aNote.maRect != aItr->maRect)  //neue VisArea 
setzen
+if (aNote.maRect != aItr->maRect)  // set new VisArea
 {
 
aNote.mpTextHelper->SetOffset(aNote.maRect.TopLeft());
 aNote.mpTextHelper->UpdateChildren();
diff --git a/svtools/source/misc/imap.cxx b/svtools/source/misc/imap.cxx
index 68b912d87f65..83d8cc5c205a 100644
--- a/svtools/source/misc/imap.cxx
+++ b/svtools/source/misc/imap.cxx
@@ -863,7 +863,7 @@ void ImageMap::ImpReadImageMap( SvStream& rIStm, size_t 
nCount )
 nCount = nMaxRecords;
 }
 
-// neue Objekte einlesen
+// read new objects
 for (size_t i = 0; i < nCount; ++i)
 {
 sal_uInt16 nType;
diff --git a/sw/source/core/frmedt/fecopy.cxx b/sw/source/core/frmedt/fecopy.cxx
index 11513cf65eff..743920a0b8f3 100644
--- a/sw/source/core/frmedt/fecopy.cxx
+++ b/sw/source/core/frmedt/fecopy.cxx
@@ -1005,7 +1005,7 @@ bool SwFEShell::Paste( SwDoc* pClpDoc )
 }
 else
 {
-OSL_ENSURE( RES_DRAWFRMFMT == pNew->Which(), 
"Neues Format.");
+OSL_ENSURE( RES_DRAWFRMFMT == pNew->Which(), 
"New format.");
 // #i52780# - drawing object has
 // to be made visible on paste.
 
pNew->CallSwClientNotify(sw::DrawFrameFormatHint(sw::DrawFrameFormatHintId::PREPPASTING));
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 1a459f5d14cb

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

2017-05-18 Thread Caolán McNamara 
 reportdesign/source/core/sdr/UndoActions.cxx  |2 +-
 reportdesign/source/ui/inspection/GeometryHandler.cxx |4 ++--
 reportdesign/source/ui/report/ReportController.cxx|6 +++---
 reportdesign/source/ui/report/SectionWindow.cxx   |3 ++-
 4 files changed, 8 insertions(+), 7 deletions(-)

New commits:
commit 8b1101023f01b2c7478a014b5ead73ada4fd4861
Author: Caolán McNamara 
Date:   Thu May 18 16:26:42 2017 +0100

drop toString

Change-Id: I0f67c8931523bbe90bfbc8cc7d9a5bd523758ee5

diff --git a/reportdesign/source/core/sdr/UndoActions.cxx 
b/reportdesign/source/core/sdr/UndoActions.cxx
index 390b9a0b8540..aedab260613f 100644
--- a/reportdesign/source/core/sdr/UndoActions.cxx
+++ b/reportdesign/source/core/sdr/UndoActions.cxx
@@ -383,7 +383,7 @@ void ORptUndoPropertyAction::setProperty(bool _bOld)
 
 OUString ORptUndoPropertyAction::GetComment() const
 {
-OUString aStr( ModuleRes(RID_STR_UNDO_PROPERTY).toString() );
+OUString aStr( ModuleRes(RID_STR_UNDO_PROPERTY) );
 
 return aStr.replaceFirst("#", m_aPropertyName);
 }
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx 
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index a50e3e01a40b..8297cba94832 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1751,7 +1751,7 @@ void 
GeometryHandler::impl_fillScopeList_nothrow(::std::vector< OUString >& _out
 else if ( xSection == xReportDefinition->getDetail() )
 nPos = xGroups->getCount()-1;
 
-const OUString sGroup = ModuleRes(RID_STR_SCOPE_GROUP).toString();
+const OUString sGroup = ModuleRes(RID_STR_SCOPE_GROUP);
 for (sal_Int32 i = 0 ; i <= nPos ; ++i)
 {
 xGroup.set(xGroups->getByIndex(i),uno::UNO_QUERY_THROW);
@@ -1778,7 +1778,7 @@ uno::Reference< report::XFunctionsSupplier> 
GeometryHandler::fillScope_throw(OUS
 const uno::Reference< report::XGroup> 
xGroup(xSection->getGroup(),uno::UNO_QUERY);
 if ( xGroup.is() )
 {
-OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP).toString();
+OUString sGroupName = ModuleRes(RID_STR_SCOPE_GROUP);
 _rsNamePostfix = xGroup->getExpression();
 m_sScope = sGroupName.replaceFirst("%1",_rsNamePostfix);
 xReturn = xGroup.get();
diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index 2404ff61e236..d89b20903a21 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2906,7 +2906,7 @@ uno::Reference 
OReportController::executeReport()
 
 // our first message says: we caught an exception
 sdb::SQLContext aFirstMessage;
-OUString 
sInfo(ModuleRes(RID_STR_CAUGHT_FOREIGN_EXCEPTION).toString());
+OUString sInfo(ModuleRes(RID_STR_CAUGHT_FOREIGN_EXCEPTION));
 sInfo = sInfo.replaceAll("$type$", 
aCaughtException.getValueTypeName());
 aFirstMessage.Message = sInfo;
 
@@ -3261,12 +3261,12 @@ void OReportController::createPageNumber(const 
Sequence< PropertyValue >& _aArgs
 SequenceAsHashMap aMap(_aArgs);
 bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE, false);
 
-OUString sFunction( ModuleRes(STR_RPT_PN_PAGE).toString() );
+OUString sFunction( ModuleRes(STR_RPT_PN_PAGE) );
 sFunction = sFunction.replaceFirst("#PAGENUMBER#", "PageNumber()");
 
 if ( bStateOfPage )
 {
-sFunction += ModuleRes(STR_RPT_PN_PAGE_OF).toString();
+sFunction += ModuleRes(STR_RPT_PN_PAGE_OF);
 sFunction = sFunction.replaceFirst("#PAGECOUNT#", "PageCount()");
 }
 
diff --git a/reportdesign/source/ui/report/SectionWindow.cxx 
b/reportdesign/source/ui/report/SectionWindow.cxx
index 502609531ec0..6e4a3fa386e6 100644
--- a/reportdesign/source/ui/report/SectionWindow.cxx
+++ b/reportdesign/source/ui/report/SectionWindow.cxx
@@ -191,7 +191,8 @@ bool OSectionWindow::setGroupSectionTitle(const 
uno::Reference< report::XGroup>&
 sExpression = sLabel;
 }
 
-OUString sTitle( ModuleRes(_nResId).toString() );
+ModuleRes aRes(_nResId);
+OUString sTitle(aRes);
 sTitle = sTitle.replaceFirst("#", sExpression);
 m_aStartMarker->setTitle( sTitle );
 m_aStartMarker->Invalidate(InvalidateFlags::Children);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-26 Thread Stephan Bergmann 
 reportdesign/source/ui/dlg/Navigator.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bdc7b541956c396bb32b6527305a836e771a80dd
Author: Stephan Bergmann 
Date:   Wed Apr 26 10:55:40 2017 +0200

Fix MSVC build

Change-Id: I6c13e9699a7ebc7cd3855242bd2bbab5f08b382b

diff --git a/reportdesign/source/ui/dlg/Navigator.cxx 
b/reportdesign/source/ui/dlg/Navigator.cxx
index a3d7e01a4f8d..307dca5572df 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -839,7 +839,7 @@ void NavigatorTree::UserData::_propertyChanged(const 
beans::PropertyChangeEvent&
 {
 if ( bFooterOn )
 ++nPos;
-
m_pTree->traverseSection(pMemFunSection(&aGroupHelper),pEntry,bFooterOn ? 
RID_SVXBMP_GROUPFOOTER : RID_SVXBMP_GROUPHEADER,nPos);
+
m_pTree->traverseSection(pMemFunSection(&aGroupHelper),pEntry,bFooterOn ? 
OUString(RID_SVXBMP_GROUPFOOTER) : OUString(RID_SVXBMP_GROUPHEADER),nPos);
 }
 }
 else if ( PROPERTY_EXPRESSION == _rEvent.PropertyName)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-15 Thread Markus Mohrhard 
 reportdesign/source/ui/dlg/GroupsSorting.cxx |   60 ---
 1 file changed, 60 deletions(-)

New commits:
commit 4d64bd4cbf652c5286272edc271f45ec447b10b8
Author: Markus Mohrhard 
Date:   Sat Apr 15 23:01:51 2017 +0200

remove unused function, loplugin:unreffun

Change-Id: I335c2c10b8f5379b0e2d4d20355dec105072d0cd
Reviewed-on: https://gerrit.libreoffice.org/36572
Tested-by: Jenkins 
Reviewed-by: Markus Mohrhard 

diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx 
b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index d3719ad7b1d9..82b741020375 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -167,8 +167,6 @@ private:
 
 DECL_LINK( CBChangeHdl, ComboBox&, void);
 
-void InsertRows( long nRow );
-
 public:
 DECL_LINK( DelayedDelete, void*, void );
 
@@ -801,64 +799,6 @@ IMPL_LINK_NOARG( OFieldExpressionControl, DelayedDelete, 
void*, void )
 DeleteRows();
 }
 
-void OFieldExpressionControl::InsertRows( long nRow )
-{
-
-sal_Int32 nSize = 0;
-
-// get rows from clipboard
-TransferableDataHelper 
aTransferData(TransferableDataHelper::CreateFromSystemClipboard(GetParent()));
-if(aTransferData.HasFormat(OGroupExchange::getReportGroupId()))
-{
-datatransfer::DataFlavor aFlavor;
-SotExchange::GetFormatDataFlavor(OGroupExchange::getReportGroupId(), 
aFlavor);
-uno::Sequence< uno::Any > aGroups;
-
-if ((aTransferData.GetAny(aFlavor, OUString()) >>= aGroups) && 
aGroups.getLength())
-{
-m_bIgnoreEvent = false;
-{
-const OUString 
sUndoAction(ModuleRes(RID_STR_UNDO_APPEND_GROUP));
-const UndoContext aUndoContext( 
m_pParent->m_pController->getUndoManager(), sUndoAction );
-
-uno::Reference xGroups = 
m_pParent->getGroups();
-sal_Int32 nGroupPos = 0;
-::std::vector::iterator aIter = 
m_aGroupPositions.begin();
-::std::vector::size_type nRowPos = static_cast< 
::std::vector::size_type >(nRow);
-if ( nRowPos < m_aGroupPositions.size() )
-{
-::std::vector::const_iterator aEnd  = 
m_aGroupPositions.begin() + nRowPos;
-for(;aIter != aEnd;++aIter)
-{
-if ( *aIter != NO_GROUP )
-nGroupPos = *aIter;
-}
-}
-for(sal_Int32 i=0;i < aGroups.getLength();++i,++nSize)
-{
-uno::Sequence< beans::PropertyValue > aArgs(2);
-aArgs[0].Name = PROPERTY_GROUP;
-aArgs[0].Value = aGroups[i];
-aArgs[1].Name = PROPERTY_POSITIONY;
-aArgs[1].Value <<= nGroupPos;
-
m_pParent->m_pController->executeChecked(SID_GROUP_APPEND,aArgs);
-
-::std::vector::iterator aInsertPos = 
m_aGroupPositions.insert(aIter,nGroupPos);
-++aInsertPos;
-aIter = aInsertPos;
-::std::vector::const_iterator aEnd  = 
m_aGroupPositions.end();
-for(;aInsertPos != aEnd;++aInsertPos)
-if ( *aInsertPos != NO_GROUP )
-++*aInsertPos;
-}
-}
-m_bIgnoreEvent = true;
-}
-}
-
-RowInserted( nRow, nSize );
-}
-
 Size OFieldExpressionControl::GetOptimalSize() const
 {
 return LogicToPixel(Size(106, 75), MapUnit::MapAppFont);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-15 Thread Caolán McNamara 
 reportdesign/source/ui/dlg/GroupsSorting.cxx |   12 
 1 file changed, 12 deletions(-)

New commits:
commit 727bf1bdd516dc826620ea9254de1b0b76805907
Author: Caolán McNamara 
Date:   Sat Apr 15 14:04:23 2017 +0100

loplugin:unreffun DelayedPaste unused

Change-Id: Ib2ca1766bbc1529c3e817d082be23f76bfc0f50f

diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx 
b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index d60b07c557e8..d3719ad7b1d9 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -165,7 +165,6 @@ protected:
 
 private:
 
-DECL_LINK( DelayedPaste, void*, void );
 DECL_LINK( CBChangeHdl, ComboBox&, void);
 
 void InsertRows( long nRow );
@@ -796,17 +795,6 @@ void OFieldExpressionControl::DeleteRows()
 Invalidate();
 }
 
-IMPL_LINK_NOARG( OFieldExpressionControl, DelayedPaste, void*, void )
-{
-m_nPasteEvent = nullptr;
-
-sal_Int32 nPastePosition = GetSelectRowCount() ? FirstSelectedRow() : 
GetCurRow();
-
-InsertRows( nPastePosition );
-SetNoSelection();
-GoToRow( nPastePosition );
-}
-
 IMPL_LINK_NOARG( OFieldExpressionControl, DelayedDelete, void*, void )
 {
 m_nDeleteEvent = nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportdesign/source sdext/source slideshow/source stoc/source svtools/source

2017-04-03 Thread Noel Grandin 
 reportdesign/source/core/api/ReportComponent.cxx  |1 -
 reportdesign/source/core/inc/ReportControlModel.hxx   |3 ++-
 reportdesign/source/core/inc/ReportHelperImpl.hxx |4 ++--
 reportdesign/source/core/sdr/RptObject.cxx|   11 ++-
 reportdesign/source/ui/inspection/GeometryHandler.cxx |4 ++--
 reportdesign/source/ui/report/ReportController.cxx|7 ---
 sdext/source/minimizer/optimizerdialogcontrols.cxx|2 +-
 sdext/source/pdfimport/tree/drawtreevisiting.cxx  |2 +-
 slideshow/source/engine/shapes/viewshape.cxx  |2 +-
 stoc/source/corereflection/crbase.cxx |2 +-
 stoc/source/corereflection/crefl.cxx  |2 +-
 svtools/source/misc/langtab.cxx   |2 +-
 12 files changed, 22 insertions(+), 20 deletions(-)

New commits:
commit 5d0e485e827057eee9fb2c997685690b710e7f34
Author: Noel Grandin 
Date:   Mon Apr 3 11:02:38 2017 +0200

use actual UNO enums in reportdesign..svtools

Change-Id: Idcd916382b87f8542dc6b5cdcb5ecb01d6947203
Reviewed-on: https://gerrit.libreoffice.org/36043
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/reportdesign/source/core/api/ReportComponent.cxx 
b/reportdesign/source/core/api/ReportComponent.cxx
index f66e5e97d52f..3c6c4baac61d 100644
--- a/reportdesign/source/core/api/ReportComponent.cxx
+++ b/reportdesign/source/core/api/ReportComponent.cxx
@@ -29,7 +29,6 @@
 #include "ReportControlModel.hxx"
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/reportdesign/source/core/inc/ReportControlModel.hxx 
b/reportdesign/source/core/inc/ReportControlModel.hxx
index 6df1c5a25484..b60aca183a3a 100644
--- a/reportdesign/source/core/inc/ReportControlModel.hxx
+++ b/reportdesign/source/core/inc/ReportControlModel.hxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -35,7 +36,7 @@ namespace reportdesign
 {
 struct OFormatProperties
 {
-::sal_Int16 nAlign;
+css::style::ParagraphAdjust nAlign;
 css::awt::FontDescriptoraFontDescriptor;
 css::awt::FontDescriptor
aAsianFontDescriptor;
 css::awt::FontDescriptor
aComplexFontDescriptor;
diff --git a/reportdesign/source/core/inc/ReportHelperImpl.hxx 
b/reportdesign/source/core/inc/ReportHelperImpl.hxx
index bc92f1167ae7..67d59ba2703a 100644
--- a/reportdesign/source/core/inc/ReportHelperImpl.hxx
+++ b/reportdesign/source/core/inc/ReportHelperImpl.hxx
@@ -226,12 +226,12 @@ void SAL_CALL clazz::setCharScaleWidth(::sal_Int16 
the_value) \
 sal_Int16 SAL_CALL clazz::getParaAdjust() \
 { \
 ::osl::MutexGuard aGuard(m_aMutex); \
-return varName.nAlign; \
+return (sal_Int16)varName.nAlign; \
 } \
  \
 void SAL_CALL clazz::setParaAdjust( sal_Int16 _align ) \
 { \
-set(PROPERTY_PARAADJUST,_align,varName.nAlign); \
+
set(PROPERTY_PARAADJUST,(css::style::ParagraphAdjust)_align,varName.nAlign); \
 } \
  \
 awt::FontDescriptor SAL_CALL clazz::getFontDescriptor() \
diff --git a/reportdesign/source/core/sdr/RptObject.cxx 
b/reportdesign/source/core/sdr/RptObject.cxx
index ed7426783038..92ee82a45587 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -187,29 +187,30 @@ namespace
 {
 sal_Int16 nTextAlign = 0;
 lhs >>= nTextAlign;
+style::ParagraphAdjust eAdjust;
 switch(nTextAlign)
 {
 case awt::TextAlign::LEFT:
-nTextAlign = style::ParagraphAdjust_LEFT;
+eAdjust = style::ParagraphAdjust_LEFT;
 break;
 case awt::TextAlign::CENTER:
-nTextAlign = style::ParagraphAdjust_CENTER;
+eAdjust = style::ParagraphAdjust_CENTER;
 break;
 case awt::TextAlign::RIGHT:
-nTextAlign = style::ParagraphAdjust_RIGHT;
+eAdjust = style::ParagraphAdjust_RIGHT;
 break;
 default:
 OSL_FAIL("Illegal text alignment value!");
 break;
 }
-aRet <<= (style::ParagraphAdjust)nTextAlign;
+aRet <<= eAdjust;
 }
 else
 {
 sal_Int16 nTextAlign = 0;
 sal_Int16 eParagraphAdjust = 0;
 lhs >>= eParagraphAdjust;
-switch(eParagraphAdjust)
+switch((style::ParagraphAdjust)eParagraphAdjust)
 {
 case style::ParagraphAdjust_LEFT:
 case style::ParagraphAdjust_BLOCK:
diff --git a

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

2017-02-06 Thread Noel Grandin 
 reportdesign/source/filter/xml/xmlEnums.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit a6fd34907fa9d2eedcd6fba2bb4c1e3340d88fb1
Author: Noel Grandin 
Date:   Mon Feb 6 09:30:37 2017 +0200

loplugin:unusedenumconstants in reportdesign

Change-Id: I19c9a72f36bcb70ca33192a75946698c64e9375a
Reviewed-on: https://gerrit.libreoffice.org/33950
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/reportdesign/source/filter/xml/xmlEnums.hxx 
b/reportdesign/source/filter/xml/xmlEnums.hxx
index 8e91f33..91214fe 100644
--- a/reportdesign/source/filter/xml/xmlEnums.hxx
+++ b/reportdesign/source/filter/xml/xmlEnums.hxx
@@ -137,8 +137,6 @@ namespace rptxml
 ,XML_TOK_PROPERTIES
 ,XML_TOK_SIZE
 ,XML_TOK_IMAGE_DATA
-,XML_TOK_IMAGE_POSITION
-,XML_TOK_IMAGE_ALIGN
 ,XML_TOK_SCALE
 ,XML_TOK_LABEL
 ,XML_TOK_DATA_FORMULA
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-08 Thread Julien Nabet 
 reportdesign/source/ui/dlg/CondFormat.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 73131fc3806ce2a7da61c93590e467e5b044c341
Author: Julien Nabet 
Date:   Fri Dec 9 00:28:46 2016 +0100

tdf#104105: fix Vcl lifecycle in CondFormat (reportdesign)

Avoid this error:
Window ( 7VclVBox()) with live children destroyed:  N5rptui9ConditionE() * n

by calling disposeAndClear on each element of m_aConditions
m_aConditions is Conditions type
Conditions type is ::std::vector< VclPtr >
See 
http://opengrok.libreoffice.org/xref/core/reportdesign/source/ui/inc/CondFormat.hxx#70

Change-Id: Ie99f8cdb5acd787892237787525d79f3231689db
Reviewed-on: https://gerrit.libreoffice.org/31775
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx 
b/reportdesign/source/ui/dlg/CondFormat.cxx
index 84dd2b9..32d81f7 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -134,6 +134,12 @@ namespace rptui
 
 void ConditionalFormattingDialog::dispose()
 {
+
+for (auto i = m_aConditions.begin(); i != m_aConditions.end(); ++i)
+{
+i->disposeAndClear();
+}
+
 m_aConditions.clear();
 m_pConditionPlayground.clear();
 m_pScrollWindow.clear();
@@ -190,7 +196,6 @@ namespace rptui
 Reference< XFormatCondition > xCond = 
m_xCopy->createFormatCondition();
 ::comphelper::copyProperties(m_xCopy.get(),xCond.get());
 m_xCopy->insertByIndex( _nNewCondIndex, makeAny( xCond ) );
-
 VclPtrInstance pCon( m_pConditionPlayground, *this, 
m_rController );
 pCon->setCondition( xCond );
 pCon->reorderWithinParent(_nNewCondIndex);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-11-17 Thread Noel Grandin 
 reportdesign/source/filter/xml/xmlStyleImport.cxx |   14 +-
 stoc/test/testcorefl.cxx  |2 +-
 stoc/test/testintrosp.cxx |4 ++--
 toolkit/source/controls/roadmapcontrol.cxx|2 +-
 4 files changed, 9 insertions(+), 13 deletions(-)

New commits:
commit fc18da9178c851b17e9ecc3777166ae3037d3e8a
Author: Noel Grandin 
Date:   Thu Nov 17 14:54:44 2016 +0200

remove some double calls

found with
   git grep -P '\W(\w+)\s*\(\s*\W'

Change-Id: Ia93f83193959c72dcc15c5c1bf54e805b43f14e5
Reviewed-on: https://gerrit.libreoffice.org/30934
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx 
b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index b32ccf6..3d98f0e 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -292,7 +292,7 @@ Reference < XNameContainer >
 Reference < XNameContainer > 
xStyles(SvXMLStylesContext::GetStylesContainer(nFamily));
 if (!xStyles.is())
 {
- OUString sName;
+OUString sName;
 switch( nFamily )
 {
 case XML_STYLE_FAMILY_TABLE_TABLE:
@@ -300,8 +300,7 @@ Reference < XNameContainer >
 if( m_xTableStyles.is() )
 xStyles.set(m_xTableStyles);
 else
-sName =
- OUString( OUString( "TableStyles" ));
+sName = "TableStyles";
 }
 break;
 case XML_STYLE_FAMILY_TABLE_CELL:
@@ -309,8 +308,7 @@ Reference < XNameContainer >
 if( m_xCellStyles.is() )
 xStyles.set(m_xCellStyles);
 else
-sName =
- OUString( OUString( "CellStyles" ));
+sName = "CellStyles";
 }
 break;
 case XML_STYLE_FAMILY_TABLE_COLUMN:
@@ -318,8 +316,7 @@ Reference < XNameContainer >
 if( m_xColumnStyles.is() )
 xStyles.set(m_xColumnStyles);
 else
-sName =
- OUString( OUString( "ColumnStyles" ));
+sName = "ColumnStyles";
 }
 break;
 case XML_STYLE_FAMILY_TABLE_ROW:
@@ -327,8 +324,7 @@ Reference < XNameContainer >
 if( m_xRowStyles.is() )
 xStyles.set(m_xRowStyles);
 else
-sName =
- OUString( OUString( "RowStyles" ));
+sName = "RowStyles";
 }
 break;
 case XML_STYLE_FAMILY_SD_GRAPHICS_ID:
diff --git a/stoc/test/testcorefl.cxx b/stoc/test/testcorefl.cxx
index e04519c..05df964 100644
--- a/stoc/test/testcorefl.cxx
+++ b/stoc/test/testcorefl.cxx
@@ -271,7 +271,7 @@ static sal_Bool test_corefl( const Reference< 
XIdlReflection > & xRefl )
 }
 
 Any gulp;
-gulp <<= OUString(OUString("Test"));
+gulp <<= OUString("Test");
 Any blup;
 blup <<= aStructC;
 
xRefl->forName("ModuleA.StructC")->getField(OUString("aString"))->set(blup, 
gulp);
diff --git a/stoc/test/testintrosp.cxx b/stoc/test/testintrosp.cxx
index 49fac8c..22df49e 100644
--- a/stoc/test/testintrosp.cxx
+++ b/stoc/test/testintrosp.cxx
@@ -332,7 +332,7 @@ public:
 virtual OUString SAL_CALL getFirstName()
 throw(RuntimeException);
 virtual OUString SAL_CALL getLastName() throw(RuntimeException)
-{ return OUString( OUString("Meyer") ); }
+{ return OUString("Meyer"); }
 virtual sal_Int16 SAL_CALL getAge() throw(RuntimeException)
 { return m_nMarkusAge; }
 virtual sal_Int16 SAL_CALL getChildrenCount() throw(RuntimeException)
@@ -521,7 +521,7 @@ Any ImplIntroTest::getPropertyValue( const OUString& 
PropertyName )
 OUString ImplIntroTest::getFirstName()
 throw(RuntimeException)
 {
-return OUString( OUString("Markus") );
+return OUString("Markus");
 }
 
 void ImplIntroTest::writeln( const OUString& Text )
diff --git a/toolkit/source/controls/roadmapcontrol.cxx 
b/toolkit/source/controls/roadmapcontrol.cxx
index 1c742f0..c6359a1 100644
--- a/toolkit/source/controls/roadmapcontrol.cxx
+++ b/toolkit/source/controls/roadmapcontrol.cxx
@@ -118,7 +118,7 @@ static void lcl_throwIndexOutOfBoundsException( )
 aReturn <<= (sal_Int16) 2;  // No Border
 break;
 case BASEPROPERTY_DEFAULTCONTROL:
-aReturn <<= OUString( OUString::createFromAscii( 
szServiceName_UnoControlRoadmap ) );
+aReturn <<= OUString::createFromAscii( 
szServiceName_UnoControlRoadmap );
 break;
 default : aReturn = 
UnoControlRoadmapModel_Base::ImplGetDefaultValue( nPropId ); break;
 }
___
Li

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

2016-11-17 Thread Noel Grandin 
 reportdesign/source/filter/xml/xmlFixedContent.cxx  |   12 +--
 reportdesign/source/filter/xml/xmlFormattedField.cxx|2 
 reportdesign/source/filter/xml/xmlImage.cxx |2 
 reportdesign/source/filter/xml/xmlReport.cxx|   50 
 reportdesign/source/filter/xml/xmlReport.hxx|2 
 reportdesign/source/filter/xml/xmlReportElementBase.cxx |   10 +--
 reportdesign/source/filter/xml/xmlReportElementBase.hxx |2 
 reportdesign/source/filter/xml/xmlSubDocument.cxx   |   14 ++--
 reportdesign/source/ui/inc/toolboxcontroller.hxx|1 
 reportdesign/source/ui/misc/toolboxcontroller.cxx   |   10 +--
 10 files changed, 52 insertions(+), 53 deletions(-)

New commits:
commit aefd00973321a304fa05cd3199e1d29a55e0e6fe
Author: Noel Grandin 
Date:   Thu Nov 17 08:42:33 2016 +0200

loplugin:datamembershadow in reportdesign

Change-Id: I90f95775c5bc6615cc8a8026355cd410e9656a89
Reviewed-on: https://gerrit.libreoffice.org/30922
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx 
b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index ea87a5d..de77b9e 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -188,20 +188,20 @@ void OXMLFixedContent::EndElement()
 Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY);
 xControl->setDataField("rpt:" + m_sPageText);
  OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
-m_pInP->m_xComponent = xControl.get();
-m_xComponent = xControl.get();
+m_pInP->m_xReportComponent = xControl.get();
+m_xReportComponent = xControl.get();
 }
 else
 {
 Reference< XFixedText > 
xControl(xFactor->createInstance(SERVICE_FIXEDTEXT),uno::UNO_QUERY);
  OSL_ENSURE(xControl.is(),"Could not create FixedContent!");
-m_pInP->m_xComponent = xControl.get();
-m_xComponent = xControl.get();
+m_pInP->m_xReportComponent = xControl.get();
+m_xReportComponent = xControl.get();
 xControl->setLabel(m_sLabel);
 }
 
-m_pContainer->addCell(m_xComponent);
-m_rCell.setComponent(m_xComponent);
+m_pContainer->addCell(m_xReportComponent);
+m_rCell.setComponent(m_xReportComponent);
 
 OXMLReportElementBase::EndElement();
 }
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx 
b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index fed1ade..bab04af 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -43,7 +43,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
 ,bool _bPageCount) :
 OXMLReportElementBase( rImport, nPrfx, 
rLName,_xComponent.get(),_pContainer)
 {
-OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
+OSL_ENSURE(m_xReportComponent.is(),"Component is NULL!");
 const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
 const SvXMLTokenMap& rTokenMap = rImport.GetControlElemTokenMap();
 
diff --git a/reportdesign/source/filter/xml/xmlImage.cxx 
b/reportdesign/source/filter/xml/xmlImage.cxx
index 0ab2c3a..818524e 100644
--- a/reportdesign/source/filter/xml/xmlImage.cxx
+++ b/reportdesign/source/filter/xml/xmlImage.cxx
@@ -47,7 +47,7 @@ OXMLImage::OXMLImage( ORptFilter& rImport,
 OXMLReportElementBase( rImport, nPrfx, 
rLName,_xComponent.get(),_pContainer)
 {
 
-OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
+OSL_ENSURE(m_xReportComponent.is(),"Component is NULL!");
 const SvXMLNamespaceMap& rMap = m_rImport.GetNamespaceMap();
 const SvXMLTokenMap& rTokenMap = m_rImport.GetControlElemTokenMap();
 static const OUString s_sTRUE = ::xmloff::token::GetXMLToken(XML_TRUE);
diff --git a/reportdesign/source/filter/xml/xmlReport.cxx 
b/reportdesign/source/filter/xml/xmlReport.cxx
index a153432..67fa765 100644
--- a/reportdesign/source/filter/xml/xmlReport.cxx
+++ b/reportdesign/source/filter/xml/xmlReport.cxx
@@ -43,9 +43,9 @@ OXMLReport::OXMLReport( ORptFilter& rImport,
 const Reference< XAttributeList > & _xAttrList
 ,const uno::Reference< report::XReportDefinition >& 
_xComponent) :
 OXMLReportElementBase( rImport, nPrfx, rLName,_xComponent.get(),nullptr)
-,m_xComponent(_xComponent)
+,m_xReportDefinition(_xComponent)
 {
-OSL_ENSURE(m_xComponent.is(),"No Report definition!");
+OSL_ENSURE(m_xReportDefinition.is(),"No Report definition!");
 
 impl_initRuntimeDefaults();
 
@@ -71,26 +71,26 @@ OXMLReport::OXMLReport( ORptFilter& rImport,
 const SvXMLEnumMapEntry* aXML_EnumMap = 
OXMLHelper::GetCommandTypeOptions();
 bool bConvertOk = SvXMLUnitConverter::convertEnum

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

2016-11-08 Thread Noel Grandin 
 reportdesign/source/core/api/FixedLine.cxx  |4 +-
 reportdesign/source/core/api/FixedText.cxx  |4 +-
 reportdesign/source/core/api/FormattedField.cxx |4 +-
 reportdesign/source/core/api/Functions.cxx  |4 +-
 reportdesign/source/core/api/Group.cxx  |   10 ++---
 reportdesign/source/core/api/Groups.cxx |4 +-
 reportdesign/source/core/api/ImageControl.cxx   |4 +-
 reportdesign/source/core/api/ReportDefinition.cxx   |   35 
 reportdesign/source/core/api/ReportEngineJFree.cxx  |2 -
 reportdesign/source/core/api/Section.cxx|6 +--
 reportdesign/source/core/api/Shape.cxx  |4 +-
 reportdesign/source/core/api/Tools.cxx  |3 -
 reportdesign/source/core/inc/Tools.hxx  |4 --
 reportdesign/source/core/inc/core_resource.hxx  |7 +---
 reportdesign/source/core/resource/core_resource.cxx |   16 +
 reportdesign/source/ui/dlg/CondFormat.cxx   |2 -
 reportdesign/source/ui/dlg/GroupsSorting.cxx|8 +---
 reportdesign/source/ui/inc/CondFormat.hxx   |3 -
 reportdesign/source/ui/inc/GroupsSorting.hxx|4 --
 reportdesign/source/ui/inc/ReportController.hxx |7 
 reportdesign/source/ui/inc/ViewsWindow.hxx  |1 
 reportdesign/source/ui/report/ReportController.cxx  |   18 ++
 reportdesign/source/ui/report/ViewsWindow.cxx   |8 
 23 files changed, 50 insertions(+), 112 deletions(-)

New commits:
commit 4948daa16d98394e19d0f09ed46586599b2be140
Author: Noel Grandin 
Date:   Tue Nov 8 08:58:49 2016 +0200

loplugin:expandablemethods in reportdesign

which led to discovering some unused parameters

Change-Id: Ie8f67a47aa9ec409637da32ef9bc457952397772
Reviewed-on: https://gerrit.libreoffice.org/30681
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/reportdesign/source/core/api/FixedLine.cxx 
b/reportdesign/source/core/api/FixedLine.cxx
index a8102db..2824b48 100644
--- a/reportdesign/source/core/api/FixedLine.cxx
+++ b/reportdesign/source/core/api/FixedLine.cxx
@@ -137,7 +137,7 @@ OFixedLine::OFixedLine(uno::Reference< 
uno::XComponentContext > const & _xContex
 ,m_LineTransparence(0)
 ,m_LineWidth(0)
 {
-m_aProps.aComponent.m_sName  = 
RPT_RESSTRING(RID_STR_FIXEDLINE,m_aProps.aComponent.m_xContext->getServiceManager());
+m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_FIXEDLINE);
 m_aProps.aComponent.m_nWidth = MIN_WIDTH;
 }
 
@@ -154,7 +154,7 @@ OFixedLine::OFixedLine(uno::Reference< 
uno::XComponentContext > const & _xContex
 ,m_LineTransparence(0)
 ,m_LineWidth(0)
 {
-m_aProps.aComponent.m_sName  = 
RPT_RESSTRING(RID_STR_FIXEDLINE,m_aProps.aComponent.m_xContext->getServiceManager());
+m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_FIXEDLINE);
 m_aProps.aComponent.m_xFactory = _xFactory;
 osl_atomic_increment( &m_refCount );
 try
diff --git a/reportdesign/source/core/api/FixedText.cxx 
b/reportdesign/source/core/api/FixedText.cxx
index 0a11eae..c0fbb05 100644
--- a/reportdesign/source/core/api/FixedText.cxx
+++ b/reportdesign/source/core/api/FixedText.cxx
@@ -48,7 +48,7 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext 
> const & _xContex
 ,FixedTextPropertySet(_xContext,static_cast< Implements 
>(IMPLEMENTS_PROPERTY_SET),lcl_getFixedTextOptionals())
 ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
 {
-m_aProps.aComponent.m_sName  = 
RPT_RESSTRING(RID_STR_FIXEDTEXT,m_aProps.aComponent.m_xContext->getServiceManager());
+m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_FIXEDTEXT);
 m_aProps.aComponent.m_nBorder = 0; // no border
 }
 
@@ -59,7 +59,7 @@ OFixedText::OFixedText(uno::Reference< uno::XComponentContext 
> const & _xContex
 ,FixedTextPropertySet(_xContext,static_cast< Implements 
>(IMPLEMENTS_PROPERTY_SET),lcl_getFixedTextOptionals())
 ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
 {
-m_aProps.aComponent.m_sName  = 
RPT_RESSTRING(RID_STR_FIXEDTEXT,m_aProps.aComponent.m_xContext->getServiceManager());
+m_aProps.aComponent.m_sName  = RPT_RESSTRING(RID_STR_FIXEDTEXT);
 m_aProps.aComponent.m_nBorder = 0; // no border
 m_aProps.aComponent.m_xFactory = _xFactory;
 osl_atomic_increment( &m_refCount );
diff --git a/reportdesign/source/core/api/FormattedField.cxx 
b/reportdesign/source/core/api/FormattedField.cxx
index 6190562..4f4056a 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -55,7 +55,7 @@ OFormattedField::OFormattedField(uno::Reference< 
uno::XComponentContext > const
 ,m_aProps(m_aMutex,static_cast< container::XContainer*>( this ),_xContext)
 ,m_nFormatKey(0)
 {
-m_aProps.aComponent.m_sName  = 
RPT_RESSTRING(RID_STR_FORMATTEDFIELD,m_aProps.aComponent.m_xContext->getServiceManager());
+m_aProps.a

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

2016-11-07 Thread Noel Grandin 
 reportdesign/source/ui/report/DesignView.cxx |   28 +--
 1 file changed, 14 insertions(+), 14 deletions(-)

New commits:
commit e53168c6875223d718df49e23b733ad6f40e0b7f
Author: Noel Grandin 
Date:   Mon Nov 7 14:18:32 2016 +0200

improve indentation

Change-Id: I1ca7f386cbd85d64e86fe293b2a4a4cbb205edef

diff --git a/reportdesign/source/ui/report/DesignView.cxx 
b/reportdesign/source/ui/report/DesignView.cxx
index 6b21aec..4c20392 100644
--- a/reportdesign/source/ui/report/DesignView.cxx
+++ b/reportdesign/source/ui/report/DesignView.cxx
@@ -184,26 +184,26 @@ bool ODesignView::PreNotify( NotifyEvent& rNEvt )
 switch(rNEvt.GetType())
 {
 case MouseNotifyEvent::KEYINPUT:
-if ( (m_pPropWin && m_pPropWin->HasChildPathFocus()) )
+{
+if ( m_pPropWin && m_pPropWin->HasChildPathFocus() )
 return false;
-if ( (m_pAddField && m_pAddField->HasChildPathFocus()) )
+if ( m_pAddField && m_pAddField->HasChildPathFocus() )
 return false;
-if ( (m_pReportExplorer && m_pReportExplorer->HasChildPathFocus()) 
)
+if ( m_pReportExplorer && m_pReportExplorer->HasChildPathFocus() )
 return false;
+const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
+if ( handleKeyEvent(*pKeyEvent) )
+bRet = true;
+else if ( bRet && m_pAccel.get() )
 {
-const KeyEvent* pKeyEvent = rNEvt.GetKeyEvent();
-if ( handleKeyEvent(*pKeyEvent) )
-bRet = true;
-else if ( bRet && m_pAccel.get() )
-{
-const vcl::KeyCode& rCode = pKeyEvent->GetKeyCode();
-util::URL aUrl;
-aUrl.Complete = 
m_pAccel->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rCode));
-if ( aUrl.Complete.isEmpty() || 
!m_xController->isCommandEnabled( aUrl.Complete ) )
-bRet = false;
-}
+const vcl::KeyCode& rCode = pKeyEvent->GetKeyCode();
+util::URL aUrl;
+aUrl.Complete = 
m_pAccel->findCommand(svt::AcceleratorExecute::st_VCLKey2AWTKey(rCode));
+if ( aUrl.Complete.isEmpty() || 
!m_xController->isCommandEnabled( aUrl.Complete ) )
+bRet = false;
 }
 break;
+}
 default:
 break;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-28 Thread Caolán McNamara 
 reportdesign/source/ui/dlg/Condition.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 03c7cfb6a680a483962d64d52c70ad5972a7b08b
Author: Caolán McNamara 
Date:   Fri Oct 28 13:14:30 2016 +0100

note yet another color selector

Change-Id: I781da1ec218148dcb723db04dfe6ef3eacffe293

diff --git a/reportdesign/source/ui/dlg/Condition.cxx 
b/reportdesign/source/ui/dlg/Condition.cxx
index e1b5b05..3a216d8 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -84,7 +84,7 @@ IMPL_LINK( ConditionField, OnFormula, Button*, 
_pClickedButton, void )
 }
 }
 
-// class SvxColorWindow_Impl --
+// TO-DO, this is yet another color selector, can it be replaced with 
SvxColorWindor/SvxColorToolBoxControl ?
 #ifndef WB_NO_DIRECTSELECT
 #define WB_NO_DIRECTSELECT  ((WinBits)0x0400)
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-23 Thread Julien Nabet 
 reportdesign/source/ui/dlg/Condition.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef663010434da24ecda35d0f0c26ce1a2b2c0f6c
Author: Julien Nabet 
Date:   Sun Oct 23 13:26:49 2016 +0200

Related tdf#103421: disposeAndClear m_aColorSet (reportdesign)

m_aColorSet has been declared as VclPtr
then initialized with VclPtr::Create(this, WinBits( WB_ITEMBORDER 
| WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT))
Following vcl/README.lifecycle, we're on the case 2 of "Who owns & disposes 
what ?"
so we should use disposeAndClear

Change-Id: I5809b54b8a15c365362c05c35a7499d8f4f69ed2
Reviewed-on: https://gerrit.libreoffice.org/30176
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/reportdesign/source/ui/dlg/Condition.cxx 
b/reportdesign/source/ui/dlg/Condition.cxx
index 9907c4f..e1b5b05 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -160,7 +160,7 @@ OColorPopup::~OColorPopup()
 void OColorPopup::dispose()
 {
 disposeBuilder();
-m_aColorSet.clear();
+m_aColorSet.disposeAndClear();
 m_pCondition.clear();
 FloatingWindow::dispose();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-12 Thread Stephan Bergmann 
 reportdesign/source/ui/inspection/GeometryHandler.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c76f90da1c54cd497c6dce6bdaeeb919f2cbe82b
Author: Stephan Bergmann 
Date:   Wed Oct 12 17:22:33 2016 +0200

loplugin:unusedvariablecheck

Change-Id: I945e4d4a3848886c061b7a29bd277a1e6c6a7505

diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx 
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 214b6a5..d0a8180 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -935,7 +935,6 @@ uno::Any GeometryHandler::getConstantValue(bool 
_bToControlValue,sal_uInt16 _nRe
 {
 ModuleRes aRes(_nResId);
 ResStringArray aResList(aRes);
-std::vector aList;
 uno::Sequence< OUString > aSeq(aResList.Count());
 for (sal_uInt32 i = 0; i < aResList.Count(); ++i)
 aSeq[i] = aResList.GetString(i);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-10-12 Thread Stephan Bergmann 
 reportdesign/source/ui/inspection/GeometryHandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bac147271317c883bf36dbe41d09036f627e005b
Author: Stephan Bergmann 
Date:   Wed Oct 12 17:20:58 2016 +0200

warning C4018: '<' : signed/unsigned mismatch

Change-Id: Ie326f95e165ffd0988bc5aff76370b8e86d158d5

diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx 
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 589e9dc..214b6a5 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1252,7 +1252,7 @@ uno::Any SAL_CALL 
GeometryHandler::convertToControlValue(const OUString & Proper
 aPropertyValue >>= nParagraphVertAlign;
 ModuleRes aRes(RID_STR_VERTICAL_ALIGN_CONST);
 ResStringArray aResList(aRes);
-if (nParagraphVertAlign < aResList.Count())
+if (sal_uInt32(nParagraphVertAlign) < aResList.Count())
 aControlValue <<= aResList.GetString(nParagraphVertAlign);
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-06-27 Thread Noel Grandin 
 reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx |6 ---
 reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx |1 
 reportdesign/source/ui/inc/DesignView.hxx   |2 -
 reportdesign/source/ui/inc/GeometryHandler.hxx  |1 
 reportdesign/source/ui/inspection/GeometryHandler.cxx   |4 --
 reportdesign/source/ui/report/DesignView.cxx|1 
 reportdesign/source/ui/report/ReportControllerObserver.cxx  |   22 +++-
 reportdesign/source/ui/report/ReportSection.cxx |2 -
 8 files changed, 9 insertions(+), 30 deletions(-)

New commits:
commit 08f2993b09d5684dc148801f6f6b402ab653aad8
Author: Noel Grandin 
Date:   Mon Jun 27 15:13:02 2016 +0200

loplugin:singlevalfields in reportdesign

Change-Id: Ife4dcb77f4c98ff2741939d31d5275d46f3b9b68
Reviewed-on: https://gerrit.libreoffice.org/26711
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx 
b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 638a5bc..c865e1c 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -76,7 +76,6 @@ ExportDocumentHandler::ExportDocumentHandler(uno::Reference< 
uno::XComponentCont
 ,m_nColumnCount(0)
 ,m_bTableRowsStarted(false)
 ,m_bFirstRowExported(false)
-,m_bExportChar(false)
 ,m_bCountColumnHeader(false)
 {
 }
@@ -275,11 +274,6 @@ void SAL_CALL ExportDocumentHandler::characters(const 
OUString & aChars) throw (
 {
 m_xDelegatee->characters(aChars);
 }
-else if ( m_bExportChar )
-{
-static const char s_sZero[] = "0";
-m_xDelegatee->characters(s_sZero);
-}
 }
 
 void SAL_CALL ExportDocumentHandler::ignorableWhitespace(const OUString & 
aWhitespaces) throw (uno::RuntimeException, xml::sax::SAXException, 
std::exception)
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx 
b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
index 203159d..27184d8 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
@@ -91,7 +91,6 @@ private:
 sal_Int32 m_nColumnCount;
 bool m_bTableRowsStarted;
 bool m_bFirstRowExported;
-bool m_bExportChar;
 bool m_bCountColumnHeader;
 };
 
diff --git a/reportdesign/source/ui/inc/DesignView.hxx 
b/reportdesign/source/ui/inc/DesignView.hxx
index 00334fc..3d820dc 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -73,7 +73,6 @@ namespace rptui
 sal_uInt16  m_eActObj;
 Sizem_aGridSizeCoarse;
 Sizem_aGridSizeFine;
-boolm_bGridSnap;
 boolm_bDeleted;
 
 
@@ -166,7 +165,6 @@ namespace rptui
 
 const Size& getGridSizeCoarse() const { return m_aGridSizeCoarse; }
 const Size& getGridSizeFine() const { return m_aGridSizeFine; }
-inline bool isGridSnap() const { return m_bGridSnap; }
 voidsetGridSnap(bool bOn);
 voidsetDragStripes(bool bOn);
 /** turns the grid on or off
diff --git a/reportdesign/source/ui/inc/GeometryHandler.hxx 
b/reportdesign/source/ui/inc/GeometryHandler.hxx
index 7512fb0..12137a6 100644
--- a/reportdesign/source/ui/inc/GeometryHandler.hxx
+++ b/reportdesign/source/ui/inc/GeometryHandler.hxx
@@ -49,7 +49,6 @@ namespace rptui
 OUString  m_sSearchString;
 OUString  m_sFormula;
 bool  m_bPreEvaluated;
-bool  m_bDeepTraversing;
 
 const OUString& getName() const { return m_sName; }
 } ;
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx 
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index de42f1f..6e30045 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1898,7 +1898,6 @@ void GeometryHandler::loadDefaultFunctions()
 if ( m_aDefaultFunctions.empty() )
 {
 m_aCounterFunction.m_bPreEvaluated = false;
-m_aCounterFunction.m_bDeepTraversing = false;
 m_aCounterFunction.m_sName = ModuleRes(RID_STR_F_COUNTER);
 m_aCounterFunction.m_sFormula = "rpt:[%FunctionName] + 1";
 m_aCounterFunction.m_sSearchString = 
"rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*";
@@ -1906,7 +1905,6 @@ void GeometryHandler::loadDefaultFunctions()
 m_aCounterFunction.m_sInitialFormula.Value = "rpt:1";

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

2016-06-22 Thread Caolán McNamara 
 reportdesign/source/ui/dlg/CondFormat.cxx |5 -
 reportdesign/source/ui/dlg/Condition.cxx  |1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 547e4b3a80708600edbc3f5669b4428877b5a951
Author: Caolán McNamara 
Date:   Wed Jun 22 12:22:20 2016 +0100

Resolves: tdf#100303 Report crashes on close of conditional formatting 
dialog

Condition multiply inherits so the Builder::disposeBuilder call was missed

and prenotify occurs during ::dispose when there is no 
m_pConditionPlayground
anymore, so m_pConditionPlayground == 0 where pPlaygroundCandidate is 0
passes, so a random widget gets cast to somethings its not, hence the bad
cast exception

Change-Id: I6d081dd55df1a68ab893294858e1ab0054d5e049

diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx 
b/reportdesign/source/ui/dlg/CondFormat.cxx
index 910f4a0..c48f462 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -500,7 +500,10 @@ namespace rptui
 }
 case MouseNotifyEvent::GETFOCUS:
 {
-if ( m_bDeletingCondition )
+if (m_bDeletingCondition)
+break;
+
+if (!m_pConditionPlayground) //e.g. during dispose
 break;
 
 const vcl::Window* pGetFocusWindow( _rNEvt.GetWindow() );
diff --git a/reportdesign/source/ui/dlg/Condition.cxx 
b/reportdesign/source/ui/dlg/Condition.cxx
index 142be8a..36cf305 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -329,6 +329,7 @@ void Condition::dispose()
 m_pAddCondition.clear();
 m_pRemoveCondition.clear();
 m_pColorFloat.disposeAndClear();
+disposeBuilder();
 VclHBox::dispose();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-05-22 Thread Noel Grandin 
 reportdesign/source/core/api/ReportDefinition.cxx |   37 --
 reportdesign/source/filter/xml/xmlExport.cxx  |7 +---
 sc/source/core/data/attrib.cxx|   36 ++---
 sc/source/core/data/fillinfo.cxx  |3 -
 sc/source/core/data/table3.cxx|1 
 sc/source/core/tool/chgtrack.cxx  |2 -
 sc/source/core/tool/interpr1.cxx  |3 -
 sc/source/filter/excel/read.cxx   |1 
 sc/source/filter/excel/xetable.cxx|1 
 sc/source/filter/html/htmlexp.cxx |2 -
 sc/source/ui/app/drwtrans.cxx |4 --
 sc/source/ui/app/transobj.cxx |2 -
 sc/source/ui/docshell/docsh5.cxx  |5 --
 sc/source/ui/docshell/docsh8.cxx  |   12 ---
 sc/source/ui/drawfunc/fusel.cxx   |6 ---
 sc/source/ui/unoobj/styleuno.cxx  |3 -
 sc/source/ui/view/editsh.cxx  |1 
 sc/source/ui/view/output2.cxx |2 -
 sc/source/ui/view/viewfun2.cxx|1 
 sd/source/core/drawdoc3.cxx   |2 -
 sd/source/filter/ppt/propread.cxx |2 -
 sd/source/ui/unoidl/unosrch.cxx   |1 
 sw/source/core/docnode/ndtbl.cxx  |1 
 sw/source/core/edit/autofmt.cxx   |1 
 sw/source/core/text/frmcrsr.cxx   |2 -
 sw/source/filter/ww8/ww8par2.cxx  |2 -
 sw/source/filter/ww8/ww8par5.cxx  |6 +--
 sw/source/filter/ww8/ww8scan.cxx  |1 
 sw/source/uibase/dochdl/swdtflvr.cxx  |4 --
 sw/source/uibase/docvw/edtwin.cxx |1 
 sw/source/uibase/uno/unomod.cxx   |3 -
 sw/source/uibase/utlui/prcntfld.cxx   |5 --
 sw/source/uibase/utlui/uitool.cxx |1 
 sw/source/uibase/wrtsh/select.cxx |2 -
 34 files changed, 40 insertions(+), 123 deletions(-)

New commits:
commit 7b26389414b203a4f3225acf0c027b93bcb234ac
Author: Noel Grandin 
Date:   Fri May 20 12:02:48 2016 +0200

clang-tidy clang-analyzer-deadcode.DeadStores

Change-Id: I7113a13ac36db5beef3a17e9849c1f5506df2374
Reviewed-on: https://gerrit.libreoffice.org/25194
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 4349d28..f4ccbb0 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1317,8 +1317,8 @@ void SAL_CALL OReportDefinition::storeToStorage( const 
uno::Reference< embed::XS
 uno::Sequence < beans::PropertyValue > aProps;
 
 // export sub streams for package, else full stream into a file
-bool bWarn = false, bErr = false;
-OUString sWarnFile, sErrFile;
+bool bErr = false;
+OUString sErrFile;
 
 uno::Reference< beans::XPropertySet> 
xProp(_xStorageToSaveTo,uno::UNO_QUERY);
 if ( xProp.is() )
@@ -1373,49 +1373,28 @@ void SAL_CALL OReportDefinition::storeToStorage( const 
uno::Reference< embed::XS
 if( !bErr )
 {
 xInfoSet->setPropertyValue("StreamName", 
uno::makeAny(OUString("settings.xml")));
-if( !WriteThroughComponent(
+WriteThroughComponent(
 xCom, "settings.xml",
 "com.sun.star.comp.report.XMLSettingsExporter",
-aDelegatorArguments, aProps, _xStorageToSaveTo ) )
-{
-if( !bWarn )
-{
-bWarn = true;
-sWarnFile = "settings.xml";
-}
-}
+aDelegatorArguments, aProps, _xStorageToSaveTo );
 }
 
 if( !bErr )
 {
 xInfoSet->setPropertyValue("StreamName", 
uno::makeAny(OUString("meta.xml")));
-if( !WriteThroughComponent(
+WriteThroughComponent(
 xCom, "meta.xml",
 "com.sun.star.comp.report.XMLMetaExporter",
-aDelegatorArguments, aProps, _xStorageToSaveTo ) )
-{
-if( !bWarn )
-{
-bWarn = true;
-sWarnFile = "meta.xml";
-}
-}
+aDelegatorArguments, aProps, _xStorageToSaveTo );
 }
 
 if( !bErr )
 {
 xInfoSet->setPropertyValue("StreamName", 
uno::makeAny(OUString("styles.xml")));
-if( !WriteThroughComponent(
+WriteThroughComponent(
 xCom, "styles.xml",
 "com.sun.star.comp.report.XMLStylesExporter",
-aDelegatorArguments, aProps, _xStorageToSaveTo ) )
-{
-if( !bWarn )
-{
-bWarn = true;
-sWarnFile = "styles.xml";
-}
-}
+aDelegatorArguments, aProps, _xStorageToSaveTo );
 }

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

2016-04-27 Thread slideon 
 reportdesign/source/filter/xml/xmlExport.cxx  |6 --
 sc/source/ui/Accessibility/AccessibleCellBase.cxx |   10 ++
 2 files changed, 10 insertions(+), 6 deletions(-)

New commits:
commit fd0d4f845da5c247be0543db34de9615be8f81a7
Author: slideon 
Date:   Fri Apr 1 10:36:33 2016 -0400

Add default line width defines for TableBorders

This define makes things clearer.

Change-Id: Idd4abf11ed7657c688ea95aac1958ee4b1fd32ee
Reviewed-on: https://gerrit.libreoffice.org/23732
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 
Tested-by: Eike Rathke 

diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index 2928520..7d01e8e 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -60,6 +60,8 @@
 
 #include 
 
+#define DEFAULT_LINE_WIDTH 2
+
 namespace rptxml
 {
 using namespace xmloff;
@@ -1149,9 +1151,9 @@ void ORptExport::exportAutoStyle(XPropertySet* 
_xProp,const ReferencegetPosition();
 awt::Size aSize = xFixedLine->getSize();
diff --git a/sc/source/ui/Accessibility/AccessibleCellBase.cxx 
b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
index 436e0d6..7637027 100644
--- a/sc/source/ui/Accessibility/AccessibleCellBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCellBase.cxx
@@ -49,6 +49,8 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::accessibility;
 
+#define DEFAULT_LINE_WIDTH 2
+
 //=  internal  
 
 ScAccessibleCellBase::ScAccessibleCellBase(
@@ -502,10 +504,10 @@ OUString SAL_CALL ScAccessibleCellBase::getBorderAttrs()
 aBottomBorder.Color = aColor.GetColor();
 aLeftBorder.Color = aColor.GetColor();
 aRightBorder.Color = aColor.GetColor();
-aTopBorder.OuterLineWidth =2;
-aBottomBorder.OuterLineWidth =2;
-aLeftBorder.OuterLineWidth =2;
-aRightBorder.OuterLineWidth =2;
+aTopBorder.OuterLineWidth = DEFAULT_LINE_WIDTH;
+aBottomBorder.OuterLineWidth = DEFAULT_LINE_WIDTH;
+aLeftBorder.OuterLineWidth = DEFAULT_LINE_WIDTH;
+aRightBorder.OuterLineWidth = DEFAULT_LINE_WIDTH;
 }
 
 //construct border attributes string
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-04-18 Thread Jochen Nitschke 
 reportdesign/source/ui/report/dlgedfunc.cxx |   42 
 1 file changed, 19 insertions(+), 23 deletions(-)

New commits:
commit 1b75b28ac5fd3b491e50c4a04148964c16a89df9
Author: Jochen Nitschke 
Date:   Mon Apr 18 09:13:29 2016 +

cppcheck: silence known condition warning in reportdesign

Change-Id: I6debdd6fce7296e8a8827eab7a99fe96ef176d12
Reviewed-on: https://gerrit.libreoffice.org/24202
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/reportdesign/source/ui/report/dlgedfunc.cxx 
b/reportdesign/source/ui/report/dlgedfunc.cxx
index b38ac8f..7e78e33 100644
--- a/reportdesign/source/ui/report/dlgedfunc.cxx
+++ b/reportdesign/source/ui/report/dlgedfunc.cxx
@@ -388,32 +388,28 @@ void DlgEdFunc::activateOle(SdrObject* _pObj)
 
 if (nSdrObjKind == OBJ_OLE2)
 {
-bool bIsInplaceOle = false;
-if (!bIsInplaceOle)
+SdrOle2Obj* pOleObj = dynamic_cast(_pObj);
+if (pOleObj && pOleObj->GetObjRef().is())
 {
-SdrOle2Obj* pOleObj = dynamic_cast(_pObj);
-if (pOleObj && pOleObj->GetObjRef().is())
+if (m_rView.IsTextEdit())
 {
-if (m_rView.IsTextEdit())
-{
-m_rView.SdrEndTextEdit();
-}
+m_rView.SdrEndTextEdit();
+}
 
-pOleObj->AddOwnLightClient();
-pOleObj->SetWindow(VCLUnoHelper::GetInterface(m_pParent));
-try
-{
-pOleObj->GetObjRef()->changeState( 
embed::EmbedStates::UI_ACTIVE );
-m_bUiActive = true;
-OReportController& rController = 
m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController();
-m_bShowPropertyBrowser = 
rController.isCommandChecked(SID_SHOW_PROPERTYBROWSER);
-if ( m_bShowPropertyBrowser )
-
rController.executeChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< 
beans::PropertyValue >());
-}
-catch( uno::Exception& )
-{
-DBG_UNHANDLED_EXCEPTION();
-}
+pOleObj->AddOwnLightClient();
+pOleObj->SetWindow(VCLUnoHelper::GetInterface(m_pParent));
+try
+{
+pOleObj->GetObjRef()->changeState( 
embed::EmbedStates::UI_ACTIVE );
+m_bUiActive = true;
+OReportController& rController = 
m_pParent->getSectionWindow()->getViewsWindow()->getView()->getReportView()->getController();
+m_bShowPropertyBrowser = 
rController.isCommandChecked(SID_SHOW_PROPERTYBROWSER);
+if ( m_bShowPropertyBrowser )
+
rController.executeChecked(SID_SHOW_PROPERTYBROWSER,uno::Sequence< 
beans::PropertyValue >());
+}
+catch( uno::Exception& )
+{
+DBG_UNHANDLED_EXCEPTION();
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-04-03 Thread Caolán McNamara 
 reportdesign/source/ui/dlg/GroupsSorting.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e860d1ebaf5d009d2b73784a400539f8902c06b0
Author: Caolán McNamara 
Date:   Sun Apr 3 21:52:05 2016 +0100

coverity#1358027 silence Using invalid iterator

Change-Id: Id4306122a7d51491392996b8914e1411e9a4ed0f

diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx 
b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 2beba3d..d81924b 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -668,8 +668,8 @@ void SAL_CALL OFieldExpressionControl::elementRemoved(const 
container::Container
 sal_Int32 nGroupPos = 0;
 if ( evt.Accessor >>= nGroupPos )
 {
-::std::vector::iterator aFind = 
::std::find(m_aGroupPositions.begin(),m_aGroupPositions.end(),nGroupPos);
-::std::vector::const_iterator aEnd  = 
m_aGroupPositions.end();
+std::vector::iterator aEnd = m_aGroupPositions.end();
+std::vector::iterator aFind = 
std::find(m_aGroupPositions.begin(), aEnd, nGroupPos);
 if (aFind != aEnd)
 {
 *aFind = NO_GROUP;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-03-28 Thread Julien Nabet 
 reportdesign/source/core/api/FormattedField.cxx   |4 
 reportdesign/source/core/api/Functions.cxx|2 
 reportdesign/source/core/api/Groups.cxx   |2 
 reportdesign/source/core/api/ReportDefinition.cxx |   10 +-
 reportdesign/source/core/sdr/PropertyForward.cxx  |   10 +-
 reportdesign/source/core/sdr/RptPage.cxx  |4 
 reportdesign/source/core/sdr/UndoEnv.cxx  |2 
 reportdesign/source/filter/xml/xmlExport.cxx  |   32 +++---
 reportdesign/source/filter/xml/xmlTable.cxx   |   16 +--
 reportdesign/source/ui/dlg/GroupsSorting.cxx  |   16 +--
 reportdesign/source/ui/inspection/GeometryHandler.cxx |6 -
 reportdesign/source/ui/misc/RptUndo.cxx   |4 
 reportdesign/source/ui/misc/toolboxcontroller.cxx |2 
 reportdesign/source/ui/report/DesignView.cxx  |2 
 reportdesign/source/ui/report/ReportController.cxx|   14 +--
 reportdesign/source/ui/report/ReportSection.cxx   |4 
 reportdesign/source/ui/report/ViewsWindow.cxx |   84 +-
 17 files changed, 107 insertions(+), 107 deletions(-)

New commits:
commit 02fb3fd0533222dfea5b6b9232425a5e28cd340f
Author: Julien Nabet 
Date:   Mon Mar 28 22:27:52 2016 +0200

Use const_iterator when possible (reportdesign)

Change-Id: I2695fdf64670f4df844c1362a84af83f48fc29be
Reviewed-on: https://gerrit.libreoffice.org/23575
Tested-by: Jenkins 
Reviewed-by: Julien Nabet 

diff --git a/reportdesign/source/core/api/FormattedField.cxx 
b/reportdesign/source/core/api/FormattedField.cxx
index 04e078d..da050bd 100644
--- a/reportdesign/source/core/api/FormattedField.cxx
+++ b/reportdesign/source/core/api/FormattedField.cxx
@@ -220,8 +220,8 @@ uno::Reference< util::XCloneable > SAL_CALL 
OFormattedField::createClone(  ) thr
 
 if ( xSet.is() )
 {
-::std::vector< uno::Reference< report::XFormatCondition> >::iterator 
aIter = m_aProps.m_aFormatConditions.begin();
-::std::vector< uno::Reference< report::XFormatCondition> >::iterator 
aEnd  = m_aProps.m_aFormatConditions.end();
+::std::vector< uno::Reference< report::XFormatCondition> 
>::const_iterator aIter = m_aProps.m_aFormatConditions.begin();
+::std::vector< uno::Reference< report::XFormatCondition> 
>::const_iterator aEnd  = m_aProps.m_aFormatConditions.end();
 for (sal_Int32 i = 0; aIter != aEnd; ++aIter,++i)
 {
 uno::Reference< report::XFormatCondition > xCond = 
xSet->createFormatCondition();
diff --git a/reportdesign/source/core/api/Functions.cxx 
b/reportdesign/source/core/api/Functions.cxx
index e436e39..e46f5b5 100644
--- a/reportdesign/source/core/api/Functions.cxx
+++ b/reportdesign/source/core/api/Functions.cxx
@@ -142,7 +142,7 @@ uno::Any SAL_CALL OFunctions::getByIndex( ::sal_Int32 Index 
) throw (lang::Index
 {
 ::osl::MutexGuard aGuard(m_aMutex);
 checkIndex(Index);
-TFunctions::iterator aPos = m_aFunctions.begin();
+TFunctions::const_iterator aPos = m_aFunctions.begin();
 ::std::advance(aPos,Index);
 return uno::makeAny(*aPos);
 }
diff --git a/reportdesign/source/core/api/Groups.cxx 
b/reportdesign/source/core/api/Groups.cxx
index 65308e5..8cc220d 100644
--- a/reportdesign/source/core/api/Groups.cxx
+++ b/reportdesign/source/core/api/Groups.cxx
@@ -143,7 +143,7 @@ uno::Any SAL_CALL OGroups::getByIndex( ::sal_Int32 Index ) 
throw (lang::IndexOut
 {
 ::osl::MutexGuard aGuard(m_aMutex);
 checkIndex(Index);
-TGroups::iterator aPos = m_aGroups.begin();
+TGroups::const_iterator aPos = m_aGroups.begin();
 ::std::advance(aPos,Index);
 return uno::makeAny(*aPos);
 }
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 1cbc191..4babedf 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1098,7 +1098,7 @@ void SAL_CALL OReportDefinition::close( sal_Bool 
_bDeliverOwnership ) throw (uti
 
 ::std::vector< uno::Reference< frame::XController> > aCopy = 
m_pImpl->m_aControllers;
 ::std::vector< uno::Reference< frame::XController> >::iterator aIter = 
aCopy.begin();
-::std::vector< uno::Reference< frame::XController> >::iterator aEnd = 
aCopy.end();
+::std::vector< uno::Reference< frame::XController> >::const_iterator aEnd 
= aCopy.end();
 for (;aIter != aEnd ; ++aIter)
 {
 if ( aIter->is() )
@@ -1915,8 +1915,8 @@ uno::Reference< container::XIndexAccess > SAL_CALL 
OReportDefinition::getViewDat
 {
 m_pImpl->m_xViewData.set( 
document::IndexedPropertyValues::create(m_aProps->m_xContext), uno::UNO_QUERY);
 uno::Reference< container::XIndexContainer > 
xContainer(m_pImpl->m_xViewData,uno::UNO_QUERY);
-::std::vector< uno::Reference< frame::XController> >::iterator aIter = 
m_pImpl->m_aControllers.begin();
-::std::vector< uno::Referen

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

2016-02-22 Thread Miklos Vajna 
 reportdesign/source/filter/xml/xmlExport.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit c602f7fdb0ea01c6be83b8a53f28374de131b1f5
Author: Miklos Vajna 
Date:   Mon Feb 22 09:23:46 2016 +0100

reportdesign: -Werror=unused-but-set-variable

Change-Id: I52784fb331dfdb80c8c9bdb56b9542bca5aaa412

diff --git a/reportdesign/source/filter/xml/xmlExport.cxx 
b/reportdesign/source/filter/xml/xmlExport.cxx
index 6b99aaf..c595a44 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -641,10 +641,6 @@ void ORptExport::exportSectionAutoStyle(const 
Reference& _xProp)
 
 if (x2 - x1 != 0 && y2 - y1 != 0)
 {
-awt::Size aElementSize = xReportElement->getSize();
-if ( xFixedLine.is() && xFixedLine->getOrientation() == 1 ) // 
vertical
-aElementSize.Width = 
static_cast(xFixedLine->getWidth()*0.5);
-
 sal_Int32 nColSpan = x2 - x1;
 sal_Int32 nRowSpan = y2 - y1;
 aInsert->second[y1].second[x1] =
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-12-22 Thread Maxim Monastirsky 
 reportdesign/source/ui/dlg/Navigator.cxx |6 ++
 reportdesign/source/ui/inc/Navigator.hxx |1 +
 2 files changed, 7 insertions(+)

New commits:
commit a0839a85e0f1b9a60a49c12359e8e56e813e0bc6
Author: Maxim Monastirsky 
Date:   Tue Dec 22 21:57:35 2015 +0200

Fix VclPtr issue in rptui::ONavigator

Window ( 7VclVBox()) with live children destroyed:
N5rptui13NavigatorTreeE()

Change-Id: I974f73afd7dd259135d9bfcd47dd6bc8e7cc0d40

diff --git a/reportdesign/source/ui/dlg/Navigator.cxx 
b/reportdesign/source/ui/dlg/Navigator.cxx
index 1d757c7..b5e3335 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -911,6 +911,12 @@ void ONavigator::GetFocus()
 m_pImpl->m_pNavigatorTree->GrabFocus();
 }
 
+void ONavigator::dispose()
+{
+m_pImpl->m_pNavigatorTree.disposeAndClear();
+FloatingWindow::dispose();
+}
+
 } // rptui
 
 
diff --git a/reportdesign/source/ui/inc/Navigator.hxx 
b/reportdesign/source/ui/inc/Navigator.hxx
index ef31fa2..29f6e28 100644
--- a/reportdesign/source/ui/inc/Navigator.hxx
+++ b/reportdesign/source/ui/inc/Navigator.hxx
@@ -38,6 +38,7 @@ namespace rptui
 
 // window
 virtual void GetFocus() override;
+virtual void dispose() override;
 };
 
 } // namespace rptui
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-10-19 Thread Noel Grandin 
 reportdesign/source/filter/xml/xmlFixedContent.cxx  |   16 
 reportdesign/source/filter/xml/xmlFormattedField.cxx|2 +-
 reportdesign/source/filter/xml/xmlReport.hxx|1 +
 reportdesign/source/filter/xml/xmlReportElementBase.hxx |2 +-
 sc/source/ui/vba/vbaformat.cxx  |   12 +---
 sc/source/ui/vba/vbastyle.cxx   |   13 ++---
 sc/source/ui/vba/vbastyle.hxx   |1 +
 sw/source/filter/ww8/wrtw8nds.cxx   |3 ++-
 sw/source/filter/ww8/wrtww8.cxx |1 +
 sw/source/filter/ww8/wrtww8.hxx |1 +
 10 files changed, 19 insertions(+), 33 deletions(-)

New commits:
commit ebd6fec73bfd77aa78a1ae92256d59d04ba999f3
Author: Noel Grandin 
Date:   Mon Oct 19 09:00:04 2015 +0200

Revert "cppcheck:duplInheritedMember"

This reverts commit a55496a9e88ac3da821b0ae0d334866d669540c6.

diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx 
b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 757a4f0..c18edf5 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -187,21 +187,21 @@ void OXMLFixedContent::EndElement()
 uno::Reference< uno::XInterface> xInt = 
xFactor->createInstance(SERVICE_FORMATTEDFIELD);
 Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY);
 xControl->setDataField("rpt:" + m_sPageText);
-OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
-m_pInP->m_xReportComponent = xControl.get();
-m_xReportComponent = xControl.get();
+ OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
+m_pInP->m_xComponent = xControl.get();
+m_xComponent = xControl.get();
 }
 else
 {
 Reference< XFixedText > 
xControl(xFactor->createInstance(SERVICE_FIXEDTEXT),uno::UNO_QUERY);
-OSL_ENSURE(xControl.is(),"Could not create FixedContent!");
-m_pInP->m_xReportComponent = xControl.get();
-m_xReportComponent = xControl.get();
+ OSL_ENSURE(xControl.is(),"Could not create FixedContent!");
+m_pInP->m_xComponent = xControl.get();
+m_xComponent = xControl.get();
 xControl->setLabel(m_sLabel);
 }
 
-m_pContainer->addCell(m_xReportComponent);
-m_rCell.setComponent(m_xReportComponent);
+m_pContainer->addCell(m_xComponent);
+m_rCell.setComponent(m_xComponent);
 
 OXMLReportElementBase::EndElement();
 }
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx 
b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index b244cb8..47053d3 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -43,7 +43,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
 ,bool _bPageCount) :
 OXMLReportElementBase( rImport, nPrfx, 
rLName,_xComponent.get(),_pContainer)
 {
-OSL_ENSURE(m_xReportComponent.is(),"Component is NULL!");
+OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
 const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
 const SvXMLTokenMap& rTokenMap = rImport.GetControlElemTokenMap();
 
diff --git a/reportdesign/source/filter/xml/xmlReport.hxx 
b/reportdesign/source/filter/xml/xmlReport.hxx
index 13aa3cd..0a94525 100644
--- a/reportdesign/source/filter/xml/xmlReport.hxx
+++ b/reportdesign/source/filter/xml/xmlReport.hxx
@@ -27,6 +27,7 @@ namespace rptxml
 class ORptFilter;
 class OXMLReport : public OXMLReportElementBase, public IMasterDetailFieds
 {
+::com::sun::star::uno::Reference< 
::com::sun::star::report::XReportDefinition > m_xComponent;
 ::std::vector< OUString> m_aMasterFields;
 ::std::vector< OUString> m_aDetailFields;
 OXMLReport(const OXMLReport&) = delete;
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx 
b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
index ec14b63..c087dbd 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
@@ -44,7 +44,7 @@ namespace rptxml
 protected:
 ORptFilter&   m_rImport;
 OXMLTable*m_pContainer;
-::com::sun::star::uno::Reference< 
::com::sun::star::report::XReportComponent >  m_xReportComponent;
+::com::sun::star::uno::Reference< 
::com::sun::star::report::XReportComponent >  m_xComponent;
 
 virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix,
 const OUString& rLocalName,
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbaformat.cxx
index 1896a12..42aaa8f 100644
--- a/sc/source/ui/vba/vbaformat.cxx
+++ b/sc/source/ui/vb

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

2015-10-18 Thread Noel Grandin 
 reportdesign/source/filter/xml/xmlFixedContent.cxx  |   16 
 reportdesign/source/filter/xml/xmlFormattedField.cxx|2 +-
 reportdesign/source/filter/xml/xmlReport.hxx|1 -
 reportdesign/source/filter/xml/xmlReportElementBase.hxx |2 +-
 sc/source/ui/vba/vbaformat.cxx  |   12 +++-
 sc/source/ui/vba/vbastyle.cxx   |   13 +++--
 sc/source/ui/vba/vbastyle.hxx   |1 -
 sw/source/filter/ww8/wrtw8nds.cxx   |3 +--
 sw/source/filter/ww8/wrtww8.cxx |1 -
 sw/source/filter/ww8/wrtww8.hxx |1 -
 10 files changed, 33 insertions(+), 19 deletions(-)

New commits:
commit a55496a9e88ac3da821b0ae0d334866d669540c6
Author: Noel Grandin 
Date:   Sat Oct 17 18:17:22 2015 +0200

cppcheck:duplInheritedMember

Change-Id: Ie525330eb79a80fd47a6bfe46343aa25ae0aeb5c
Reviewed-on: https://gerrit.libreoffice.org/19419
Reviewed-by: Noel Grandin 
Tested-by: Noel Grandin 

diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx 
b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index c18edf5..757a4f0 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -187,21 +187,21 @@ void OXMLFixedContent::EndElement()
 uno::Reference< uno::XInterface> xInt = 
xFactor->createInstance(SERVICE_FORMATTEDFIELD);
 Reference< report::XFormattedField > xControl(xInt,uno::UNO_QUERY);
 xControl->setDataField("rpt:" + m_sPageText);
- OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
-m_pInP->m_xComponent = xControl.get();
-m_xComponent = xControl.get();
+OSL_ENSURE(xControl.is(),"Could not create FormattedField!");
+m_pInP->m_xReportComponent = xControl.get();
+m_xReportComponent = xControl.get();
 }
 else
 {
 Reference< XFixedText > 
xControl(xFactor->createInstance(SERVICE_FIXEDTEXT),uno::UNO_QUERY);
- OSL_ENSURE(xControl.is(),"Could not create FixedContent!");
-m_pInP->m_xComponent = xControl.get();
-m_xComponent = xControl.get();
+OSL_ENSURE(xControl.is(),"Could not create FixedContent!");
+m_pInP->m_xReportComponent = xControl.get();
+m_xReportComponent = xControl.get();
 xControl->setLabel(m_sLabel);
 }
 
-m_pContainer->addCell(m_xComponent);
-m_rCell.setComponent(m_xComponent);
+m_pContainer->addCell(m_xReportComponent);
+m_rCell.setComponent(m_xReportComponent);
 
 OXMLReportElementBase::EndElement();
 }
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx 
b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index 47053d3..b244cb8 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -43,7 +43,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
 ,bool _bPageCount) :
 OXMLReportElementBase( rImport, nPrfx, 
rLName,_xComponent.get(),_pContainer)
 {
-OSL_ENSURE(m_xComponent.is(),"Component is NULL!");
+OSL_ENSURE(m_xReportComponent.is(),"Component is NULL!");
 const SvXMLNamespaceMap& rMap = rImport.GetNamespaceMap();
 const SvXMLTokenMap& rTokenMap = rImport.GetControlElemTokenMap();
 
diff --git a/reportdesign/source/filter/xml/xmlReport.hxx 
b/reportdesign/source/filter/xml/xmlReport.hxx
index 0a94525..13aa3cd 100644
--- a/reportdesign/source/filter/xml/xmlReport.hxx
+++ b/reportdesign/source/filter/xml/xmlReport.hxx
@@ -27,7 +27,6 @@ namespace rptxml
 class ORptFilter;
 class OXMLReport : public OXMLReportElementBase, public IMasterDetailFieds
 {
-::com::sun::star::uno::Reference< 
::com::sun::star::report::XReportDefinition > m_xComponent;
 ::std::vector< OUString> m_aMasterFields;
 ::std::vector< OUString> m_aDetailFields;
 OXMLReport(const OXMLReport&) = delete;
diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.hxx 
b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
index c087dbd..ec14b63 100644
--- a/reportdesign/source/filter/xml/xmlReportElementBase.hxx
+++ b/reportdesign/source/filter/xml/xmlReportElementBase.hxx
@@ -44,7 +44,7 @@ namespace rptxml
 protected:
 ORptFilter&   m_rImport;
 OXMLTable*m_pContainer;
-::com::sun::star::uno::Reference< 
::com::sun::star::report::XReportComponent >  m_xComponent;
+::com::sun::star::uno::Reference< 
::com::sun::star::report::XReportComponent >  m_xReportComponent;
 
 virtual SvXMLImportContext* _CreateChildContext( sal_uInt16 nPrefix,
 const OUString& rLocalName,
diff --git a/sc/source/ui/vba/vbaformat.cxx b/sc/source/ui/vba/vbafor

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

2015-10-16 Thread Oliver Specht 
 reportdesign/source/core/sdr/ReportDrawPage.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit c1d38a06752e8f8fd7c79eb1c1a736662e4ccc8b
Author: Oliver Specht 
Date:   Fri Oct 16 12:31:44 2015 +0200

tdf#94965: crash in report wizard fixed

fixed the wrong rtti replacement from 
85f93697defd9a812a0cda0bc4e9364e28c0339e

Change-Id: Iaed0f1e452ae0ec2e479c8e9084ffcbabbb595f9
Reviewed-on: https://gerrit.libreoffice.org/19406
Tested-by: Jenkins 
Reviewed-by: Oliver Specht 

diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx 
b/reportdesign/source/core/sdr/ReportDrawPage.cxx
index f34459c..6947780 100644
--- a/reportdesign/source/core/sdr/ReportDrawPage.cxx
+++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx
@@ -74,7 +74,7 @@ uno::Reference< drawing::XShape >  
OReportDrawPage::_CreateShape( SdrObject *pOb
 OUString sServiceName = pBaseObj->getServiceName();
 OSL_ENSURE(!sServiceName.isEmpty(),"No Service Name given!");
 
-if ( typeid(*pObj) == typeid(OUnoObject) )
+if (dynamic_cast< const OUnoObject* >(pObj) != nullptr)
 {
 OUnoObject& rUnoObj = dynamic_cast(*pObj);
 if (rUnoObj.GetObjIdentifier() == OBJ_DLG_FIXEDTEXT)
@@ -89,14 +89,14 @@ uno::Reference< drawing::XShape >  
OReportDrawPage::_CreateShape( SdrObject *pOb
 
xShape.set(static_cast(static_cast(pShape)),uno::UNO_QUERY);
 pShape->setShapeKind(pObj->GetObjIdentifier());
 }
-else if ( typeid(*pObj) == typeid(OCustomShape) )
+else if (dynamic_cast< const OCustomShape* >(pObj) != nullptr)
 {
 SvxCustomShape* pShape = new SvxCustomShape( pObj );
 uno::Reference < drawing::XEnhancedCustomShapeDefaulter > xShape2 
= pShape;
 xShape.set(xShape2,uno::UNO_QUERY);
 pShape->setShapeKind(pObj->GetObjIdentifier());
 }
-else if ( typeid(*pObj) == typeid(SdrOle2Obj) )
+else if (dynamic_cast< const SdrOle2Obj* >(pObj) != nullptr)
 {
 SdrOle2Obj& rOle2Obj = dynamic_cast(*pObj);
 if (!rOle2Obj.GetObjRef().is())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-08-04 Thread Stephan Bergmann 
 reportdesign/source/ui/inc/DesignView.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 9ce9b66eb241986a9d40d0385d0cdc73caf3b036
Author: Stephan Bergmann 
Date:   Tue Aug 4 11:12:50 2015 +0200

-Werror,-Wunused-private-field

Change-Id: I2d23f199d07b4a339f080263b27d13faddc11ffb

diff --git a/reportdesign/source/ui/inc/DesignView.hxx 
b/reportdesign/source/ui/inc/DesignView.hxx
index 33fe9dc..55e5ab2 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -70,7 +70,6 @@ namespace rptui
 OSectionView*   m_pCurrentView;
 VclPtr  m_pReportExplorer;
 Idlem_aMarkIdle;
-Point   m_aScrollOffset;
 DlgEdMode   m_eMode;
 sal_uInt16  m_eActObj;
 Sizem_aGridSizeCoarse;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-30 Thread Jorenz Paragas 
 reportdesign/source/core/sdr/PropertyForward.cxx  |8 +--
 reportdesign/source/ui/inc/ViewsWindow.hxx|   14 --
 reportdesign/source/ui/inspection/GeometryHandler.cxx |8 +--
 reportdesign/source/ui/report/ViewsWindow.cxx |   40 +-
 4 files changed, 37 insertions(+), 33 deletions(-)

New commits:
commit 02d3ae938d92988bb24b370ca0beece17bb275fa
Author: Jorenz Paragas 
Date:   Mon Jun 29 19:56:20 2015 -0700

tdf#91112 replace o3tl::compose1 with lambdas in reportdesign

Remove TReportPairHelper and TStartMarkerHelper as well since they
were helper structs that were used solely for many of these
o3tl::compose calls and are now unused.

Change-Id: I75b366a7951a841c49a34709a3bdc1877952b64d
Reviewed-on: https://gerrit.libreoffice.org/16606
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/reportdesign/source/core/sdr/PropertyForward.cxx 
b/reportdesign/source/core/sdr/PropertyForward.cxx
index b397155..3ef0438 100644
--- a/reportdesign/source/core/sdr/PropertyForward.cxx
+++ b/reportdesign/source/core/sdr/PropertyForward.cxx
@@ -119,11 +119,9 @@ void SAL_CALL OPropertyMediator::propertyChange( const 
PropertyChangeEvent& evt
 aFind = ::std::find_if(
 m_aNameMap.begin(),
 m_aNameMap.end(),
-::o3tl::compose1(
-::std::bind2nd(::std::equal_to< OUString >(), 
evt.PropertyName),
-
::o3tl::compose1(::o3tl::select1st(),::o3tl::select2nd())
-)
-);
+[&evt] (TPropertyNamePair::value_type 
namePair) {
+return namePair.second.first == 
evt.PropertyName;
+});
 if ( aFind != m_aNameMap.end() )
 sPropName = aFind->first;
 }
diff --git a/reportdesign/source/ui/inc/ViewsWindow.hxx 
b/reportdesign/source/ui/inc/ViewsWindow.hxx
index 00e0ac2..4950ec9 100644
--- a/reportdesign/source/ui/inc/ViewsWindow.hxx
+++ b/reportdesign/source/ui/inc/ViewsWindow.hxx
@@ -109,20 +109,6 @@ namespace rptui
 public:
 typedef ::std::vector< VclPtr >
TSectionsMap;
 
-struct TReportPairHelper : public ::std::unary_function< 
TSectionsMap::value_type, OReportSection >
-{
-OReportSection& operator() (const TSectionsMap::value_type& lhs) 
const
-{
-return lhs->getReportSection();
-}
-};
-struct TStartMarkerHelper : public ::std::unary_function< 
TSectionsMap::value_type, OStartMarker >
-{
-OStartMarker& operator() (const TSectionsMap::value_type& lhs) 
const
-{
-return lhs->getStartMarker();
-}
-};
 private:
 TSectionsMapm_aSections;
 svtools::ColorConfigm_aColorConfig;
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx 
b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index fd218ba..19d9225 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -805,10 +805,10 @@ inspection::LineDescriptor SAL_CALL 
GeometryHandler::describePropertyLine(const
 if ( m_nDataFieldType == USER_DEF_FUNCTION )
 {
 // add function names
-::std::for_each( m_aFunctionNames.begin(), 
m_aFunctionNames.end(),
-::o3tl::compose1(
-::boost::bind( 
&inspection::XStringListControl::appendListEntry, xListControl,_1 ),
-::o3tl::select1st()));
+::std::for_each(m_aFunctionNames.begin(), 
m_aFunctionNames.end(),
+[&xListControl] (TFunctions::value_type 
func) {
+
xListControl->appendListEntry(func.first);
+});
 }
 else
 {
diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx 
b/reportdesign/source/ui/report/ViewsWindow.cxx
index ee3dc31..e236b15 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -326,9 +326,13 @@ void OViewsWindow::removeSection(sal_uInt16 _nPosition)
 void OViewsWindow::toggleGrid(bool _bVisible)
 {
 ::std::for_each(m_aSections.begin(),m_aSections.end(),
-
::o3tl::compose1(::boost::bind(&OReportSection::SetGridVisible,_1,_bVisible),TReportPairHelper()));
+[_bVisible] (TSectionsMap::value_type sectionPtr) {
+sectionPtr->getReportSection().SetGridVisible(_bVisible);
+

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

2015-06-18 Thread Caolán McNamara 
 reportdesign/source/ui/dlg/dlgpage.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e915c1cc1e406e4a4183f373a268490373b1b761
Author: Caolán McNamara 
Date:   Thu Jun 18 16:31:01 2015 +0100

coverity#1307698 Uninitialized scalar field

Change-Id: I1229b4cdfcc741899b3ae8694e7db5d7e506ce0c

diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx 
b/reportdesign/source/ui/dlg/dlgpage.cxx
index 3e8ff66..e99a7d0 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -41,6 +41,7 @@ ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const 
SfxItemSet* pAttr, c
 : SfxTabDialog (pParent, rDialog, "modules/dbreport/ui/" +
 rDialog.toAsciiLowerCase() +
 ".ui", pAttr)
+, m_nCharBgdId(0)
 {
 SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
 assert(pFact && "Dialog creation failed!");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-08 Thread Caolán McNamara 
 reportdesign/source/ui/report/ViewsWindow.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 43cc6fa1fa704ff53e56e8fe34e673c6733c9b4e
Author: Caolán McNamara 
Date:   Mon Jun 8 15:19:58 2015 +0100

Resolves: tdf#91672 Crash in base report - right click in page header 
section

Change-Id: Ie7f9abc16e07c9ef44916e0cebe67486f3583449

diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx 
b/reportdesign/source/ui/report/ViewsWindow.cxx
index 4b9d30d..11c32b4 100644
--- a/reportdesign/source/ui/report/ViewsWindow.cxx
+++ b/reportdesign/source/ui/report/ViewsWindow.cxx
@@ -317,6 +317,7 @@ void OViewsWindow::removeSection(sal_uInt16 _nPosition)
 
 
m_pParent->getReportView()->UpdatePropertyBrowserDelayed((*aNew)->getReportSection().getSectionView());
 
+aPos->disposeAndClear();;
 m_aSections.erase(aPos);
 Resize();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-25 Thread Noel Grandin 
 reportdesign/source/ui/report/ReportController.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2704d45a58b5a0f1cd8103d143f8c2059f70dfea
Author: Noel Grandin 
Date:   Tue May 26 08:54:02 2015 +0200

tdf#91577 - CRASH: when "Report Builder" closed

audited commit 6d0c89123f353aed80d3a8a08ef5cd1ffaa1eea9
"vclwidget: fix more places that should be wrapping in VclPtr"
and fixed up the one place that needed it.

Change-Id: Iedb56353e6a967367f38fa847efb950acc869a93

diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index 486c271..d5dc72a 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -339,7 +339,7 @@ void OReportController::disposing()
 {
 SvtViewOptions aDlgOpt(E_WINDOW, 
OStringToOUString(m_pGroupsFloater->GetHelpId(), RTL_TEXTENCODING_UTF8));
 
aDlgOpt.SetWindowState(OStringToOUString(m_pGroupsFloater->GetWindowState(WINDOWSTATE_MASK_ALL),
 RTL_TEXTENCODING_ASCII_US));
-m_pGroupsFloater = NULL;
+m_pGroupsFloater.disposeAndClear();
 }
 
 try
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-24 Thread Julien Nabet 
 reportdesign/source/ui/inc/ScrollHelper.hxx|2 +-
 reportdesign/source/ui/report/ScrollHelper.cxx |8 
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 33732900bfd925f56a2bcc95a18d7bef24664133
Author: Julien Nabet 
Date:   Sun May 24 23:05:38 2015 +0200

Typo: m_pReportDefintionMultiPlexer -> m_pReportDefinitionMultiPlexer

Change-Id: I90f2119d5b43e5d6efa18561a1b04d1c0178950e

diff --git a/reportdesign/source/ui/inc/ScrollHelper.hxx 
b/reportdesign/source/ui/inc/ScrollHelper.hxx
index 531e169..1ad1b58 100644
--- a/reportdesign/source/ui/inc/ScrollHelper.hxx
+++ b/reportdesign/source/ui/inc/ScrollHelper.hxx
@@ -55,7 +55,7 @@ namespace rptui
 VclPtr m_pParent;
 VclPtr   m_aReportWindow;
 ::rtl::Reference
-m_pReportDefintionMultiPlexer; // listener 
for property changes
+m_pReportDefinitionMultiPlexer; // 
listener for property changes
 
 DECL_LINK( ScrollHdl, ScrollBar*);
 Size ResizeScrollBars();
diff --git a/reportdesign/source/ui/report/ScrollHelper.cxx 
b/reportdesign/source/ui/report/ScrollHelper.cxx
index 02cbca0..71a28ae 100644
--- a/reportdesign/source/ui/report/ScrollHelper.cxx
+++ b/reportdesign/source/ui/report/ScrollHelper.cxx
@@ -51,7 +51,7 @@ OScrollWindowHelper::OScrollWindowHelper( ODesignView* 
_pDesignView)
 ,m_aCornerWin( VclPtr::Create(this) )
 ,m_pParent(_pDesignView)
 ,m_aReportWindow(VclPtr::Create(this,m_pParent))
-,m_pReportDefintionMultiPlexer(NULL)
+,m_pReportDefinitionMultiPlexer(NULL)
 {
 SetMapMode( MapMode( MAP_100TH_MM ) );
 
@@ -74,8 +74,8 @@ OScrollWindowHelper::~OScrollWindowHelper()
 
 void OScrollWindowHelper::dispose()
 {
-if ( m_pReportDefintionMultiPlexer.is() )
-m_pReportDefintionMultiPlexer->dispose();
+if ( m_pReportDefinitionMultiPlexer.is() )
+m_pReportDefinitionMultiPlexer->dispose();
 
 m_aHScroll.disposeAndClear();
 m_aVScroll.disposeAndClear();
@@ -102,7 +102,7 @@ void OScrollWindowHelper::impl_initScrollBar( ScrollBar& 
_rScrollBar ) const
 void OScrollWindowHelper::initialize()
 {
 uno::Reference xReportDefinition = 
m_pParent->getController().getReportDefinition();
-m_pReportDefintionMultiPlexer = addStyleListener(xReportDefinition,this);
+m_pReportDefinitionMultiPlexer = addStyleListener(xReportDefinition,this);
 }
 
 void OScrollWindowHelper::setTotalSize(sal_Int32 _nWidth ,sal_Int32 _nHeight)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-05-18 Thread Tomaž Vajngerl 
 reportdesign/source/ui/report/ReportSection.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4257f4db06f6dd7c35281a89f5aafebe9c2ccb0b
Author: Tomaž Vajngerl 
Date:   Mon May 18 17:26:11 2015 +0900

fix Wundefined-bool-conversion

Change-Id: I99e57e3f4b3f5b9fa21cdf6bfbda4b15ce83eaac

diff --git a/reportdesign/source/ui/report/ReportSection.cxx 
b/reportdesign/source/ui/report/ReportSection.cxx
index 2371090..08719ff 100644
--- a/reportdesign/source/ui/report/ReportSection.cxx
+++ b/reportdesign/source/ui/report/ReportSection.cxx
@@ -162,7 +162,7 @@ void OReportSection::Paint( vcl::RenderContext& 
rRenderContext, const Rectangle&
 if(pPgView)
 {
 pPgView->DrawLayer(0, &rRenderContext);
-pPgView->GetView().EndDrawLayers(*pTargetPaintWindow, 
&rRenderContext);
+pPgView->GetView().EndDrawLayers(*pTargetPaintWindow, true);
 }
 
 m_pView->CompleteRedraw(&rRenderContext, aPaintRectRegion);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-04-28 Thread Miklos Vajna 
 reportdesign/source/ui/dlg/GroupsSorting.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 40a7169c9f177b4568725237d13c66569684f891
Author: Miklos Vajna 
Date:   Tue Apr 28 18:40:18 2015 +0200

reportdesign: fix GCC-4.7 build

Change-Id: Ib9c4a34c68b826d48b188c37f95a09f9a8d96301

diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx 
b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 5b65fc9..177b15e 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -99,7 +99,7 @@ class OFieldExpressionControl : public ::svt::EditBrowseBox
 ::osl::Mutexm_aMutex;
 ::std::vectorm_aGroupPositions;
 ::std::vector   m_aColumnInfo;
-VclPtr<::svt::ComboBoxControl>  m_pComboCell;
+VclPtr< ::svt::ComboBoxControl>  m_pComboCell;
 sal_Int32   m_nDataPos;
 sal_Int32   m_nCurrentPos;
 ImplSVEvent *   m_nPasteEvent;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportdesign/source sc/source unusedcode.easy vcl/inc vcl/unx

2015-03-05 Thread Caolán McNamara 
 reportdesign/source/core/api/Section.cxx |   19 --
 reportdesign/source/core/inc/Section.hxx |3 --
 sc/source/ui/inc/tabview.hxx |1 
 sc/source/ui/view/tabview.cxx|   42 ---
 unusedcode.easy  |5 ++-
 vcl/inc/unx/salgdi.h |4 --
 vcl/unx/generic/gdi/salgdi2.cxx  |6 
 7 files changed, 4 insertions(+), 76 deletions(-)

New commits:
commit a0183e89b7bb687f6fa09acbb72babdee9cdb6b0
Author: Caolán McNamara 
Date:   Thu Mar 5 09:15:19 2015 +

callcatcher: update unused code

Change-Id: I81b6f8af2b5c539b7adb507e787497b5ed51fa39

diff --git a/reportdesign/source/core/api/Section.cxx 
b/reportdesign/source/core/api/Section.cxx
index 3ce3a2d..4650873 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -516,25 +516,6 @@ void SAL_CALL OSection::removeVetoableChangeListener( 
const OUString& PropertyNa
 SectionPropertySet::removeVetoableChangeListener( PropertyName, aListener 
);
 }
 
-void OSection::lcl_copySection(const uno::Reference< report::XSection>& 
_xSource,uno::Reference< report::XSection>& _xDest)
-{
-if ( _xSource.is() )
-{
-::comphelper::copyProperties(_xSource.get(),_xDest.get());
-sal_Int32 nCount = _xSource->getCount();
-for(sal_Int32 i = 0;i != nCount;++i)
-{
-uno::Reference 
xClone(_xSource->getByIndex(i),uno::UNO_QUERY);
-OSL_ENSURE(xClone.is(),"No XCloneable interface found!");
-if ( xClone.is() )
-{
-uno::Reference< drawing::XShape> 
xShape(xClone->createClone(),uno::UNO_QUERY);
-_xDest->add(xShape);
-}
-}
-}
-}
-
 void SAL_CALL OSection::add( const uno::Reference< drawing::XShape >& xShape ) 
throw (uno::RuntimeException, std::exception)
 {
 {
diff --git a/reportdesign/source/core/inc/Section.hxx 
b/reportdesign/source/core/inc/Section.hxx
index f0a3031..03d06fc 100644
--- a/reportdesign/source/core/inc/Section.hxx
+++ b/reportdesign/source/core/inc/Section.hxx
@@ -228,9 +228,6 @@ namespace reportdesign
 static OSection* getImplementation( const 
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& 
_rxComponent );
 static ::com::sun::star::uno::Sequence< sal_Int8 > 
getUnoTunnelImplementationId();
 
-static void lcl_copySection(const ::com::sun::star::uno::Reference< 
::com::sun::star::report::XSection>& _xSource
- ,::com::sun::star::uno::Reference< 
::com::sun::star::report::XSection>& _xDest);
-
 void notifyElementAdded(const ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >& xShape);
 void notifyElementRemoved(const ::com::sun::star::uno::Reference< 
::com::sun::star::drawing::XShape >& xShape);
 };
diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index 63573ba..8d6010a 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -496,7 +496,6 @@ public:
 
 Point   GetMousePosPixel();
 
-voidSnapSplitPos( Point& rScreenPosPixel );
 voidFreezeSplitters( bool bFreeze );
 voidRemoveSplit();
 voidSplitAtCursor();
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 1f5f07c..24ab8ec 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -1962,48 +1962,6 @@ bool lcl_MouseIsOverWin( const Point& rScreenPosPixel, 
vcl::Window* pWin )
 
 } // anonymous namespace
 
-void ScTabView::SnapSplitPos( Point& rScreenPosPixel )
-{
-bool bOverWin = false;
-sal_uInt16 i;
-for (i=0; i<4; i++)
-if (lcl_MouseIsOverWin(rScreenPosPixel,pGridWin[i]))
-bOverWin = true;
-
-if (!bOverWin)
-return;
-
-//  don't snap to cells if the scale will be modified afterwards
-if ( GetZoomType() != SVX_ZOOM_PERCENT )
-return;
-
-ScSplitPos ePos = SC_SPLIT_BOTTOMLEFT;
-if ( aViewData.GetVSplitMode() != SC_SPLIT_NONE )
-ePos = SC_SPLIT_TOPLEFT;
-
-vcl::Window* pWin = pGridWin[ePos];
-if (!pWin)
-{
-OSL_FAIL("Window NULL");
-return;
-}
-
-Point aMouse = pWin->NormalizedScreenToOutputPixel( rScreenPosPixel );
-SCsCOL nPosX;
-SCsROW nPosY;
-//  bNextIfLarge=FALSE: nicht auf naechste Zelle, wenn ausserhalb des 
Fensters
-aViewData.GetPosFromPixel( aMouse.X(), aMouse.Y(), ePos, nPosX, nPosY, 
true, false, false );
-bool bLeft;
-bool bTop;
-aViewData.GetMouseQuadrant( aMouse, ePos, nPosX, nPosY, bLeft, bTop );
-if (!bLeft)
-++nPosX;
-if (!bTop)
-++nPosY;
-aMouse = aViewData.GetScrPos( static_cast(nPosX), 
static_cast(nPosY), ePos, true );
-rScreenPosPixel = pWin->OutputToNormalizedScreenPixel( aMouse );
-}
-
 void ScTabView::Free

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

2015-02-03 Thread Stephan Bergmann 
 reportdesign/source/core/api/ReportDefinition.cxx |   86 --
 1 file changed, 86 deletions(-)

New commits:
commit 75509c995bd51275d39cfd8fd2bd747b0f619b1c
Author: Stephan Bergmann 
Date:   Tue Feb 3 10:07:49 2015 +0100

tdf#88824: Remove FactoryLoader threads causing deadlock on Windows

...and assumed to be merely performance optimizations (so removing them 
should
hopefully not break any functionality).

Change-Id: I9f40118f5a4bd1526e0cfbf74715455d543bfd54

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index cfd39fb..5e03320 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -109,7 +109,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -473,67 +472,6 @@ uno::Sequence< uno::Any > SAL_CALL 
OStyle::getPropertyDefaults( const uno::Seque
 return aRet;
 }
 
-namespace
-{
-class FactoryLoader : public salhelper::Thread
-{
-OUString  m_sMimeType;
-uno::Reference< uno::XComponentContext > m_xContext;
-public:
-FactoryLoader(const OUString& _sMimeType,uno::Reference< 
uno::XComponentContext > const & _xContext)
-:Thread("FactoryLoader")
-,m_sMimeType(_sMimeType)
-,m_xContext(_xContext)
-{}
-
-private:
-virtual ~FactoryLoader(){}
-
-virtual void execute() SAL_OVERRIDE;
- };
-
-void FactoryLoader::execute()
-{
-try
-{
-uno::Reference xDesktop = 
frame::Desktop::create(m_xContext);
-uno::Reference 
xFrameLoad(xDesktop,uno::UNO_QUERY);
-OUString sTarget("_blank");
-sal_Int32 nFrameSearchFlag = frame::FrameSearchFlag::TASKS | 
frame::FrameSearchFlag::CREATE;
-uno::Reference< frame::XFrame> xFrame = 
xDesktop->findFrame(sTarget,nFrameSearchFlag);
-xFrameLoad.set(xFrame,uno::UNO_QUERY);
-
-if ( xFrameLoad.is() )
-{
-uno::Sequence < beans::PropertyValue > aArgs( 3);
-sal_Int32 nLen = 0;
-aArgs[nLen].Name = "AsTemplate";
-aArgs[nLen++].Value <<= sal_False;
-
-aArgs[nLen].Name = "ReadOnly";
-aArgs[nLen++].Value <<= sal_True;
-
-aArgs[nLen].Name = "Hidden";
-aArgs[nLen++].Value <<= sal_True;
-
-::comphelper::MimeConfigurationHelper aHelper(m_xContext);
-SvtModuleOptions aModuleOptions;
-uno::Reference< frame::XModel > 
xModel(xFrameLoad->loadComponentFromURL(
-aModuleOptions.GetFactoryEmptyDocumentURL( 
SvtModuleOptions::ClassifyFactoryByServiceName( 
aHelper.GetDocServiceNameFromMediaType(m_sMimeType) )),
-OUString(), // empty frame name
-0,
-aArgs
-),uno::UNO_QUERY);
-::comphelper::disposeComponent(xModel);
-}
-}
-catch (const uno::Exception&)
-{
-DBG_UNHANDLED_EXCEPTION();
-}
-}
-}
-
 struct OReportDefinitionImpl
 {
 uno::WeakReference< uno::XInterface >   m_xParent;
@@ -573,7 +511,6 @@ struct OReportDefinitionImpl
 m_pObjectContainer;
 ::boost::shared_ptrm_pReportModel;
 ::rtl::Reference< ::dbaui::UndoManager >m_pUndoManager;
-std::vector< rtl::Reference >m_aFactoryLoaders;
 OUString m_sCaption;
 OUString m_sCommand;
 OUString m_sFilter;
@@ -717,21 +654,6 @@ void OReportDefinition::init()
 {
 try
 {
-static bool s_bFirstTime = true;
-if ( s_bFirstTime )
-{
-s_bFirstTime = false;
-const uno::Sequence< OUString > aMimeTypes = 
getAvailableMimeTypes();
-const OUString* pIter = aMimeTypes.getConstArray();
-const OUString* pEnd  = pIter + aMimeTypes.getLength();
-for ( ; pIter != pEnd; ++pIter )
-{
-rtl::Reference xCreatorThread = new 
FactoryLoader(*pIter,m_aProps->m_xContext);
-m_pImpl->m_aFactoryLoaders.push_back(xCreatorThread);
-xCreatorThread->launch();
-}
-}
-
 m_pImpl->m_pReportModel.reset(new OReportModel(this));
 m_pImpl->m_pReportModel->GetItemPool().FreezeIdRanges();
 m_pImpl->m_pReportModel->SetScaleUnit( MAP_100TH_MM );
@@ -821,14 +743,6 @@ void SAL_CALL OReportDefinition::disposing()
 m_pImpl->m_xNumberedControllers.clear();
 }
 // <--- SYNCHRONIZED
-
-SolarMutexReleaser rel;
-for (std::vector< rtl::Reference >::iterator i(
-

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

2015-02-01 Thread Stephan Bergmann 
 reportdesign/source/core/api/Section.cxx |   15 ---
 1 file changed, 15 deletions(-)

New commits:
commit c97dbb56596eecd19d73a0adb49f9de1ee279e14
Author: Stephan Bergmann 
Date:   Sun Feb 1 22:06:32 2015 +0100

loplugin:unreffun

Change-Id: I32479fd238e720b9ba0fa0af55e8377ebd972a20

diff --git a/reportdesign/source/core/api/Section.cxx 
b/reportdesign/source/core/api/Section.cxx
index d25f0e2d..cec1429 100644
--- a/reportdesign/source/core/api/Section.cxx
+++ b/reportdesign/source/core/api/Section.cxx
@@ -422,21 +422,6 @@ uno::Reference< report::XReportDefinition > SAL_CALL 
OSection::getReportDefiniti
 return xRet;
 }
 
-const ::std::vector< OUString >& lcl_getControlModelMap()
-{
-static ::std::vector< OUString > s_sControlModels;
-if ( s_sControlModels.empty() )
-{
-s_sControlModels.push_back( OUString("FixedText") );
-s_sControlModels.push_back( OUString("FixedLine") );
-s_sControlModels.push_back( OUString("ImageControl") );
-s_sControlModels.push_back( OUString("FormattedField") );
-s_sControlModels.push_back( OUString("Shape") );
-}
-return s_sControlModels;
-
-}
-
 // XChild
 uno::Reference< uno::XInterface > SAL_CALL OSection::getParent(  ) throw 
(uno::RuntimeException, std::exception)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-12-01 Thread Caolán McNamara 
 reportdesign/source/ui/dlg/CondFormat.cxx |   74 +++---
 1 file changed, 38 insertions(+), 36 deletions(-)

New commits:
commit fd88318c21fbc7f6c3554e2fb524109a2aad5cf8
Author: Caolán McNamara 
Date:   Mon Dec 1 14:32:26 2014 +

WaE: -Werror=switch

Change-Id: Ib29d9c377bad2ba6dfb771b74cc97dcffe768dcb

diff --git a/reportdesign/source/ui/dlg/CondFormat.cxx 
b/reportdesign/source/ui/dlg/CondFormat.cxx
index a4d8c03..07b06dd 100644
--- a/reportdesign/source/ui/dlg/CondFormat.cxx
+++ b/reportdesign/source/ui/dlg/CondFormat.cxx
@@ -472,49 +472,51 @@ namespace rptui
 {
 switch ( _rNEvt.GetType() )
 {
-case MouseNotifyEvent::KEYINPUT:
-{
-const KeyEvent* pKeyEvent( _rNEvt.GetKeyEvent() );
-const vcl::KeyCode& rKeyCode = pKeyEvent->GetKeyCode();
-if ( rKeyCode.IsMod1() && rKeyCode.IsMod2() )
+case MouseNotifyEvent::KEYINPUT:
 {
-if ( rKeyCode.GetCode() == 0x0508 )
-{
-impl_deleteCondition_nothrow( 
impl_getFocusedConditionIndex( 0 ) );
-return true;
-}
-if ( rKeyCode.GetCode() == 0x0507 ) // +
+const KeyEvent* pKeyEvent( _rNEvt.GetKeyEvent() );
+const vcl::KeyCode& rKeyCode = pKeyEvent->GetKeyCode();
+if ( rKeyCode.IsMod1() && rKeyCode.IsMod2() )
 {
-impl_addCondition_nothrow( impl_getFocusedConditionIndex( 
impl_getConditionCount() - 1 ) + 1 );
-return true;
+if ( rKeyCode.GetCode() == 0x0508 )
+{
+impl_deleteCondition_nothrow( 
impl_getFocusedConditionIndex( 0 ) );
+return true;
+}
+if ( rKeyCode.GetCode() == 0x0507 ) // +
+{
+impl_addCondition_nothrow( 
impl_getFocusedConditionIndex( impl_getConditionCount() - 1 ) + 1 );
+return true;
+}
 }
-}
-}
-break;
-case MouseNotifyEvent::GETFOCUS:
-{
-if ( m_bDeletingCondition )
 break;
-
-const vcl::Window* pGetFocusWindow( _rNEvt.GetWindow() );
-
-// determine whether the new focus window is part of an (currently 
invisible) condition
-const vcl::Window* pConditionCandidate = 
pGetFocusWindow->GetParent();
-const vcl::Window* pPlaygroundCandidate = pConditionCandidate ? 
pConditionCandidate->GetParent() : NULL;
-while   (   ( pPlaygroundCandidate )
-&&  ( pPlaygroundCandidate != this )
-&&  ( pPlaygroundCandidate != m_pConditionPlayground )
-)
-{
-pConditionCandidate = pConditionCandidate->GetParent();
-pPlaygroundCandidate = pConditionCandidate ? 
pConditionCandidate->GetParent() : NULL;
 }
-if (pConditionCandidate && pPlaygroundCandidate == 
m_pConditionPlayground)
+case MouseNotifyEvent::GETFOCUS:
 {
-impl_ensureConditionVisible( dynamic_cast< const Condition& >( 
*pConditionCandidate ).getConditionIndex() );
+if ( m_bDeletingCondition )
+break;
+
+const vcl::Window* pGetFocusWindow( _rNEvt.GetWindow() );
+
+// determine whether the new focus window is part of an 
(currently invisible) condition
+const vcl::Window* pConditionCandidate = 
pGetFocusWindow->GetParent();
+const vcl::Window* pPlaygroundCandidate = pConditionCandidate 
? pConditionCandidate->GetParent() : NULL;
+while   (   ( pPlaygroundCandidate )
+&&  ( pPlaygroundCandidate != this )
+&&  ( pPlaygroundCandidate != m_pConditionPlayground )
+)
+{
+pConditionCandidate = pConditionCandidate->GetParent();
+pPlaygroundCandidate = pConditionCandidate ? 
pConditionCandidate->GetParent() : NULL;
+}
+if (pConditionCandidate && pPlaygroundCandidate == 
m_pConditionPlayground)
+{
+impl_ensureConditionVisible( dynamic_cast< const 
Condition& >( *pConditionCandidate ).getConditionIndex() );
+}
+break;
 }
-}
-break;
+default:
+break;
 }
 
 return ModalDialog::PreNotify( _rNEvt );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-10-13 Thread Tor Lillqvist 
 reportdesign/source/ui/report/ReportController.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 758a78ca6e1a734695a09b9c9a6c59f567ae938f
Author: Tor Lillqvist 
Date:   Mon Oct 13 21:37:20 2014 +0300

WaE: unused variable 'aNullShadowCol'

Change-Id: I3907306b53f77874597ac2b727fad9f3a3a3c333

diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index d1646b4..bdfa224 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -2425,7 +2425,6 @@ void OReportController::openPageDialog(const 
uno::Reference& _
 const Graphic aNullGraphic;
 const ::Color aNullLineCol(COL_DEFAULT_SHAPE_STROKE); // #i121448# Use 
defined default color
 const ::Color aNullFillCol(COL_DEFAULT_SHAPE_FILLING); // #i121448# Use 
defined default color
-const ::Color aNullShadowCol(RGB_Color(COL_LIGHTGRAY));
 const XDash aNullDash;
 const XGradient aNullGrad(RGB_Color(COL_BLACK), RGB_Color(COL_WHITE));
 const XHatch aNullHatch(aNullLineCol);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-07-08 Thread Stephan Bergmann 
 reportdesign/source/ui/dlg/Condition.cxx |1 -
 reportdesign/source/ui/dlg/Condition.hxx |1 -
 2 files changed, 2 deletions(-)

New commits:
commit aa9aff1483a58f8e5a484487710422349a5301a1
Author: Stephan Bergmann 
Date:   Wed Jul 9 08:14:30 2014 +0200

-Werror,-Wunused-private-field

Change-Id: I9d540c2a404600bba038853d73d0cce63f162ea2

diff --git a/reportdesign/source/ui/dlg/Condition.cxx 
b/reportdesign/source/ui/dlg/Condition.cxx
index 12e675b..c7d64a7 100644
--- a/reportdesign/source/ui/dlg/Condition.cxx
+++ b/reportdesign/source/ui/dlg/Condition.cxx
@@ -210,7 +210,6 @@ Condition::Condition( Window* _pParent, 
IConditionalFormatAction& _rAction, ::rp
 ,m_pBtnUpdaterFontColor(NULL)
 ,m_pBtnUpdaterBackgroundColor(NULL)
 ,m_nCondIndex( 0 )
-,m_nLastKnownWindowWidth( -1 )
 ,m_bInDestruction( false )
 {
 m_pUIBuilder = new VclBuilder(this, getUIRootDir(), 
"modules/dbreport/ui/conditionwin.ui");
diff --git a/reportdesign/source/ui/dlg/Condition.hxx 
b/reportdesign/source/ui/dlg/Condition.hxx
index 7635082..b127088 100644
--- a/reportdesign/source/ui/dlg/Condition.hxx
+++ b/reportdesign/source/ui/dlg/Condition.hxx
@@ -96,7 +96,6 @@ namespace rptui
 
 
 size_t  m_nCondIndex;
-longm_nLastKnownWindowWidth;
 boolm_bInDestruction;
 
 ConditionalExpressions  m_aConditionalExpressions;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-30 Thread Miklos Vajna 
 reportdesign/source/ui/dlg/AddField.cxx  |2 +-
 reportdesign/source/ui/dlg/GroupsSorting.cxx |1 -
 reportdesign/source/ui/dlg/Navigator.cxx |1 -
 reportdesign/source/ui/inc/CondFormat.hxx|1 -
 4 files changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 28177b61a843cab1094d04d189bb5fedcc6ea55a
Author: Miklos Vajna 
Date:   Mon Jun 30 20:35:47 2014 +0200

error: direct base 'boost::noncopyable' inaccessible due to ambiguity

Change-Id: I3d2d530ebdb3341956e9b7a3c1f22b621a52deff

diff --git a/reportdesign/source/ui/dlg/AddField.cxx 
b/reportdesign/source/ui/dlg/AddField.cxx
index 1b447be..5bea9c5 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -60,7 +60,7 @@ using namespace lang;
 using namespace container;
 using namespace ::svx;
 
-class OAddFieldWindowListBox: public SvTreeListBox, private boost::noncopyable
+class OAddFieldWindowListBox: public SvTreeListBox
 {
 OAddFieldWindow*m_pTabWin;
 
diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx 
b/reportdesign/source/ui/dlg/GroupsSorting.cxx
index 6a0a18c..9557309 100644
--- a/reportdesign/source/ui/dlg/GroupsSorting.cxx
+++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx
@@ -82,7 +82,6 @@ typedef ::svt::EditBrowseBox OFieldExpressionControl_Base;
 typedef ::cppu::WeakImplHelper1< container::XContainerListener > 
TContainerListenerBase;
 class OFieldExpressionControl : public TContainerListenerBase
,public OFieldExpressionControl_Base
-   ,private boost::noncopyable
 {
 ::osl::Mutexm_aMutex;
 ::std::vectorm_aGroupPositions;
diff --git a/reportdesign/source/ui/dlg/Navigator.cxx 
b/reportdesign/source/ui/dlg/Navigator.cxx
index 8d912fc..f89a445 100644
--- a/reportdesign/source/ui/dlg/Navigator.cxx
+++ b/reportdesign/source/ui/dlg/Navigator.cxx
@@ -111,7 +111,6 @@ class NavigatorTree :   public ::cppu::BaseMutex
 ,   public reportdesign::ITraverseReport
 ,   public comphelper::OSelectionChangeListener
 ,   public ::comphelper::OPropertyChangeListener
-,   private boost::noncopyable
 {
 class UserData;
 friend class UserData;
diff --git a/reportdesign/source/ui/inc/CondFormat.hxx 
b/reportdesign/source/ui/inc/CondFormat.hxx
index 2a177e5..86b3d3c 100644
--- a/reportdesign/source/ui/inc/CondFormat.hxx
+++ b/reportdesign/source/ui/inc/CondFormat.hxx
@@ -68,7 +68,6 @@ namespace rptui
 \/
 class ConditionalFormattingDialog  :public ModalDialog
 ,public IConditionalFormatAction
-,private ::boost::noncopyable
 {
 typedef ::boost::shared_ptr< Condition >ConditionPtr;
 typedef ::std::vector< ConditionPtr >   Conditions;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-04 Thread Stephan Bergmann 
 reportdesign/source/core/api/ReportDefinition.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 89d982ab83f5388c7b1c6220d258a10e2788b9b2
Author: Stephan Bergmann 
Date:   Wed Jun 4 23:43:47 2014 +0200

...and avoid SolarMutex deadlock when joining FactoryLoader threads

Change-Id: I6ae206d18dc03f99739ea20c72853db9662924d2

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index c678d16..53855c4 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -822,6 +822,7 @@ void SAL_CALL OReportDefinition::disposing()
 }
 // <--- SYNCHRONIZED
 
+SolarMutexReleaser rel;
 for (std::vector< rtl::Reference >::iterator i(
  m_pImpl->m_aFactoryLoaders.begin());
  i != m_pImpl->m_aFactoryLoaders.end(); ++i)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-04 Thread Stephan Bergmann 
 reportdesign/source/core/api/ReportDefinition.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit faf40b99aaa5dd0264921224d3a04b80c2cef329
Author: Stephan Bergmann 
Date:   Wed Jun 4 23:30:30 2014 +0200

Missing launch of FactoryLoader threads

...regression introduced with 06a09dd0ad1e8afcf69e877501036e068d477438 "Join
FactoryLoader threads."  (Also, hopefully, the original use of
osl::Thread::setPriority was just cargo cult, as salhelper::Thread does not 
make
that feature available to clients, so it had been dropped in
06a09dd0ad1e8afcf69e877501036e068d477438.)

Change-Id: I055c8fb20f3bbf13ba823436be24167d3446ed05

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 07a9421..c678d16 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -726,8 +726,9 @@ void OReportDefinition::init()
 const OUString* pEnd  = pIter + aMimeTypes.getLength();
 for ( ; pIter != pEnd; ++pIter )
 {
-m_pImpl->m_aFactoryLoaders.push_back(
-new FactoryLoader(*pIter,m_aProps->m_xContext));
+rtl::Reference xCreatorThread = new 
FactoryLoader(*pIter,m_aProps->m_xContext);
+m_pImpl->m_aFactoryLoaders.push_back(xCreatorThread);
+xCreatorThread->launch();
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-04 Thread Stephan Bergmann 
 reportdesign/source/core/api/ReportDefinition.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 10ec4a7cb24da8ced86880bbceeca4d2ad3436f1
Author: Stephan Bergmann 
Date:   Wed Jun 4 14:16:59 2014 +0200

Left over "SAL_CALL"

Change-Id: I02cf4b4a145e29dc1bc529f0c0fbfbc4a6cdc47e

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 6182535..07a9421 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -492,7 +492,7 @@ namespace
 virtual void execute() SAL_OVERRIDE;
  };
 
-void SAL_CALL FactoryLoader::execute()
+void FactoryLoader::execute()
 {
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-06-04 Thread Stephan Bergmann 
 reportdesign/source/core/api/ReportDefinition.cxx |   42 +-
 1 file changed, 25 insertions(+), 17 deletions(-)

New commits:
commit 06a09dd0ad1e8afcf69e877501036e068d477438
Author: Stephan Bergmann 
Date:   Wed Jun 4 11:25:27 2014 +0200

Join FactoryLoader threads

Change-Id: I22b313a895057edebc8bee715813de908826763a

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 43c38d7..6182535 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -16,6 +16,11 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
+#include 
+
+#include 
+
 #include "ReportDefinition.hxx"
 
 #include "FixedLine.hxx"
@@ -104,7 +109,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -470,25 +475,24 @@ uno::Sequence< uno::Any > SAL_CALL 
OStyle::getPropertyDefaults( const uno::Seque
 
 namespace
 {
-class FactoryLoader : public ::osl::Thread
+class FactoryLoader : public salhelper::Thread
 {
 OUString  m_sMimeType;
 uno::Reference< uno::XComponentContext > m_xContext;
 public:
 FactoryLoader(const OUString& _sMimeType,uno::Reference< 
uno::XComponentContext > const & _xContext)
-:m_sMimeType(_sMimeType)
+:Thread("FactoryLoader")
+,m_sMimeType(_sMimeType)
 ,m_xContext(_xContext)
 {}
 
-protected:
+private:
 virtual ~FactoryLoader(){}
 
-/// Working method which should be overridden.
-virtual void SAL_CALL run() SAL_OVERRIDE;
-virtual void SAL_CALL onTerminated() SAL_OVERRIDE;
-};
+virtual void execute() SAL_OVERRIDE;
+ };
 
-void SAL_CALL FactoryLoader::run()
+void SAL_CALL FactoryLoader::execute()
 {
 try
 {
@@ -528,10 +532,6 @@ namespace
 DBG_UNHANDLED_EXCEPTION();
 }
 }
-void SAL_CALL FactoryLoader::onTerminated()
-{
-delete this;
-}
 }
 
 struct OReportDefinitionImpl
@@ -573,6 +573,7 @@ struct OReportDefinitionImpl
 m_pObjectContainer;
 ::boost::shared_ptrm_pReportModel;
 ::rtl::Reference< ::dbaui::UndoManager >m_pUndoManager;
+std::vector< rtl::Reference >m_aFactoryLoaders;
 OUString m_sCaption;
 OUString m_sCommand;
 OUString m_sFilter;
@@ -725,10 +726,8 @@ void OReportDefinition::init()
 const OUString* pEnd  = pIter + aMimeTypes.getLength();
 for ( ; pIter != pEnd; ++pIter )
 {
-FactoryLoader* pCreatorThread = new 
FactoryLoader(*pIter,m_aProps->m_xContext);
-pCreatorThread->createSuspended();
-pCreatorThread->setPriority(osl_Thread_PriorityBelowNormal);
-pCreatorThread->resume();
+m_pImpl->m_aFactoryLoaders.push_back(
+new FactoryLoader(*pIter,m_aProps->m_xContext));
 }
 }
 
@@ -782,6 +781,7 @@ void SAL_CALL OReportDefinition::disposing()
 m_pImpl->m_aStorageChangeListeners.disposeAndClear( aDisposeEvent );
 
 // SYNCHRONIZED --->
+{
 SolarMutexGuard aSolarGuard;
 ::osl::ResettableMutexGuard aGuard(m_aMutex);
 
@@ -818,7 +818,15 @@ void SAL_CALL OReportDefinition::disposing()
 m_pImpl->m_aArgs.realloc(0);
 m_pImpl->m_xTitleHelper.clear();
 m_pImpl->m_xNumberedControllers.clear();
+}
 // <--- SYNCHRONIZED
+
+for (std::vector< rtl::Reference >::iterator i(
+ m_pImpl->m_aFactoryLoaders.begin());
+ i != m_pImpl->m_aFactoryLoaders.end(); ++i)
+{
+(*i)->join();
+}
 }
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-27 Thread Lionel Elie Mamane 
 reportdesign/source/filter/xml/xmlSubDocument.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3a99c2f91e7d58d38a57d8cc16eb52f422dd9116
Author: Lionel Elie Mamane 
Date:   Tue May 27 12:37:54 2014 +0200

OXMLSubDocument: copy PrintWhenGroupChange, too

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

diff --git a/reportdesign/source/filter/xml/xmlSubDocument.cxx 
b/reportdesign/source/filter/xml/xmlSubDocument.cxx
index ab74e20..c94b762 100644
--- a/reportdesign/source/filter/xml/xmlSubDocument.cxx
+++ b/reportdesign/source/filter/xml/xmlSubDocument.cxx
@@ -118,6 +118,7 @@ void OXMLSubDocument::EndElement()
 uno::Reference< report::XReportControlModel >   
xComponentModel(m_xComponent,uno::UNO_QUERY);
 if ( xComponentModel.is() && xFakeModel.is() )
 {
+
xComponentModel->setPrintWhenGroupChange(xFakeModel->getPrintWhenGroupChange());
 const sal_Int32 nCount = xFakeModel->getCount();
 try
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-25 Thread Maxim Monastirsky 
 reportdesign/source/ui/misc/toolboxcontroller.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 16ba360f2a526654cedfcd4cda230442c3a8a522
Author: Maxim Monastirsky 
Date:   Thu May 22 11:27:33 2014 +0300

reportdesign: Update shape buttons with sub toolbar selection

Change-Id: Ie39f1005182da118475fdf9c4e463bfb902d4446

diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx 
b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index 492f647..2bdbd25 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -278,7 +278,12 @@ Reference< awt::XWindow > SAL_CALL 
OToolboxController::createPopupWindow() throw
 
 sal_Bool SAL_CALL OToolboxController::opensSubToolbar() throw 
(uno::RuntimeException, std::exception)
 {
-return m_nSlotId == SID_DRAWTBX_CS_BASIC;
+return ( m_nSlotId == SID_DRAWTBX_CS_BASIC ||
+ m_nSlotId == SID_DRAWTBX_CS_SYMBOL ||
+ m_nSlotId == SID_DRAWTBX_CS_ARROW ||
+ m_nSlotId == SID_DRAWTBX_CS_FLOWCHART ||
+ m_nSlotId == SID_DRAWTBX_CS_CALLOUT ||
+ m_nSlotId == SID_DRAWTBX_CS_STAR );
 }
 
 OUString SAL_CALL OToolboxController::getSubToolbarName() throw 
(uno::RuntimeException, std::exception)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-11 Thread Julien Nabet 
 reportdesign/source/ui/inspection/DataProviderHandler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a4d30abf39e2834043a4c6b49583e5e86e6e205e
Author: Julien Nabet 
Date:   Sun May 11 11:47:08 2014 +0200

Fix previous commit (reportdesign part, following)

Change-Id: Ib55bdc21fa6081c55777465115538905c1cab5e0

diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx 
b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
index 03ba432..9e61350 100644
--- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx
+++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx
@@ -303,7 +303,7 @@ uno::Any SAL_CALL 
DataProviderHandler::convertToPropertyValue(const OUString & _
 case PROPERTY_ID_PREVIEW_COUNT:
 try
 {
-aPropertyValue = m_xTypeConverter->convertTo( _rControlValue, 
::cppu::UnoType::get()0));
+aPropertyValue = m_xTypeConverter->convertTo( _rControlValue, 
::cppu::UnoType::get());
 }
 catch( const uno::Exception& )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-05-11 Thread Julien Nabet 
 reportdesign/source/core/api/ReportDefinition.cxx |   64 +++---
 1 file changed, 32 insertions(+), 32 deletions(-)

New commits:
commit 7347a8ed38fb1494fde6f0bfc5a61bbc7135c790
Author: Julien Nabet 
Date:   Sun May 11 11:42:01 2014 +0200

Fix previous commit (reportdesign part)

Change-Id: I490326abccac237bd70209d2a3dd623ebd5c59a2

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 4d3bc94..2eaff03 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -304,85 +304,85 @@ OStyle::OStyle()
 sal_Int32 i = 0;
 registerPropertyNoMember( PROPERTY_NAME, ++i,nBound,::getCppuType( 
static_cast< OUString *>(NULL) ), &sName );
 
-registerPropertyNoMember(PROPERTY_BACKCOLOR,
++i,nBound,::cppu::UnoType::get()0) ,&nTransparent);
+registerPropertyNoMember(PROPERTY_BACKCOLOR,
++i,nBound,::cppu::UnoType::get(), &nTransparent);
 
 registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION,  
++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
 registerPropertyNoMember(PROPERTY_BACKTRANSPARENT,  
++i,nBound,::getBooleanCppuType() ,&bTrue);
-registerPropertyNoMember(SC_UNO_PAGE_BORDERDIST,  
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
+registerPropertyNoMember(SC_UNO_PAGE_BORDERDIST,  
++i,nBound,::cppu::UnoType::get(), &nZero);
 registerPropertyNoMember(SC_UNO_PAGE_BOTTBORDER,  
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
-registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST, 
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
-registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, 
++i,nBound,::cppu::UnoType::get()0) ,&nMargin);
+registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST, 
++i,nBound,::cppu::UnoType::get(), &nZero);
+registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, 
++i,nBound,::cppu::UnoType::get(), &nMargin);
 registerPropertyNoMember("DisplayName",   
++i,nBound,::getCppuType((OUString*)0) ,&sEmpty);
-registerPropertyNoMember(SC_UNO_PAGE_FTRBACKCOL,  
++i,nBound,::cppu::UnoType::get()0) ,&nTransparent);
+registerPropertyNoMember(SC_UNO_PAGE_FTRBACKCOL,  
++i,nBound,::cppu::UnoType::get(), &nTransparent);
 registerPropertyNoMember(SC_UNO_PAGE_FTRGRFFILT,  
++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty);
 registerPropertyNoMember(SC_UNO_PAGE_FTRGRFLOC,   
++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
 registerPropertyNoMember(SC_UNO_PAGE_FTRGRFURL,   
++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty);
 registerPropertyNoMember(SC_UNO_PAGE_FTRBACKTRAN, 
++i,nBound,::getBooleanCppuType() ,&bTrue);
-registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST, 
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
-registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST,  
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
+registerPropertyNoMember(SC_UNO_PAGE_FTRBODYDIST, 
++i,nBound,::cppu::UnoType::get(), &nZero);
+registerPropertyNoMember(SC_UNO_PAGE_FTRBRDDIST,  
++i,nBound,::cppu::UnoType::get(), &nZero);
 registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBOR,  
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
-registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBDIS, 
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
-registerPropertyNoMember(SC_UNO_PAGE_FTRHEIGHT,   
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
+registerPropertyNoMember(SC_UNO_PAGE_FTRBOTTBDIS, 
++i,nBound,::cppu::UnoType::get(), &nZero);
+registerPropertyNoMember(SC_UNO_PAGE_FTRHEIGHT,   
++i,nBound,::cppu::UnoType::get(), &nZero);
 registerPropertyNoMember(SC_UNO_PAGE_FTRDYNAMIC,  
++i,nBound,::getBooleanCppuType() ,&bFalse);
 registerPropertyNoMember(SC_UNO_PAGE_FTRON,   
++i,nBound,::getBooleanCppuType() ,&bFalse);
 registerPropertyNoMember(SC_UNO_PAGE_FTRSHARED,   
++i,nBound,::getBooleanCppuType() ,&bFalse);
 registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBOR,  
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
-registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBDIS, 
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
-registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTMAR,  
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
+registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTBDIS, 
++i,nBound,::cppu::UnoType::get(), &nZero);
+registerPropertyNoMember(SC_UNO_PAGE_FTRLEFTMAR,  
++i,nBound,::cppu::UnoType::get(), &nZero);
 registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBOR, 
++i,nBound,::getCppuType((const table::BorderLine2*)0) ,&eBorderLine);
-
registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBDIS,++i,nBound,::cppu::UnoType::get()0)
 ,&nZero);
-registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTMAR, 
++i,nBound,::cppu::UnoType::get()0) ,&nZero);
+
registerPropertyNoMember(SC_UNO_PAGE_FTRRIGHTBDIS,++i,nBound,::cppu::UnoType::get(),
 &nZe

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

2014-04-14 Thread Kohei Yoshida 
 reportdesign/source/ui/dlg/Formula.cxx  |6 --
 reportdesign/source/ui/inc/Formula.hxx  |   11 ++-
 reportdesign/source/ui/misc/UITools.cxx |   11 ++-
 3 files changed, 24 insertions(+), 4 deletions(-)

New commits:
commit 6bb7fa8df523d3ae7b9945009fb1034f28cb0a0a
Author: Kohei Yoshida 
Date:   Mon Apr 14 18:56:12 2014 -0400

fdo#76294: Fix the build.

Change-Id: I123751e9f08faaccc06649c2f8b29a9a33548312

diff --git a/reportdesign/source/ui/dlg/Formula.cxx 
b/reportdesign/source/ui/dlg/Formula.cxx
index 75ddb03..5fe7375 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -46,7 +46,8 @@ FormulaDialog::FormulaDialog(Window* pParent
  , const 
uno::Reference& _xServiceFactory
  , const ::boost::shared_ptr< IFunctionManager >&  
_pFunctionMgr
  , const OUString& _sFormula
- , const ::com::sun::star::uno::Reference < 
::com::sun::star::beans::XPropertySet >& _xRowSet)
+ , const ::com::sun::star::uno::Reference < 
::com::sun::star::beans::XPropertySet >& _xRowSet
+ , svl::SharedStringPool& rStrPool )
 : FormulaModalDialog( pParent, false,false,false,_pFunctionMgr.get(),this)
 ,m_aFunctionManager(_pFunctionMgr)
 ,m_pFormulaData(new FormEditData())
@@ -56,6 +57,7 @@ FormulaDialog::FormulaDialog(Window* pParent
 ,m_sFormula("=")
 ,m_nStart(0)
 ,m_nEnd(1)
+,mrStringPool(rStrPool)
 {
 if ( !_sFormula.isEmpty() )
 {
@@ -255,7 +257,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
 ::std::auto_ptr 
FormulaDialog::convertToTokenArray(const uno::Sequence< sheet::FormulaToken >& 
_aTokenList)
 {
 ::std::auto_ptr pArray(new 
FormulaTokenArray());
-pArray->Fill(_aTokenList, NULL);
+pArray->Fill(_aTokenList, mrStringPool, NULL);
 return pArray;
 }
 
diff --git a/reportdesign/source/ui/inc/Formula.hxx 
b/reportdesign/source/ui/inc/Formula.hxx
index 030e438..d3b2f10 100644
--- a/reportdesign/source/ui/inc/Formula.hxx
+++ b/reportdesign/source/ui/inc/Formula.hxx
@@ -30,6 +30,11 @@ namespace com { namespace sun { namespace star { namespace 
lang {
 class XMultiServiceFactory;
 } } } }
 
+namespace svl {
+
+class SharedStringPool;
+
+}
 
 namespace rptui
 {
@@ -51,13 +56,17 @@ class FormulaDialog : public formula::FormulaModalDialog,
 sal_Int32   m_nStart;
 sal_Int32   m_nEnd;
 
+svl::SharedStringPool& mrStringPool;
+
 DECL_LINK( OnClickHdl, OAddFieldWindow*);
 public:
 FormulaDialog( Window* pParent
 , const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory>& _xServiceFactory
 , const ::boost::shared_ptr< formula::IFunctionManager >& _pFunctionMgr
 , const OUString& _sFormula
-, const ::com::sun::star::uno::Reference < 
::com::sun::star::beans::XPropertySet >& _xRowSet);
+, const ::com::sun::star::uno::Reference < 
::com::sun::star::beans::XPropertySet >& _xRowSet
+, svl::SharedStringPool& rStrPool );
+
 virtual ~FormulaDialog();
 
 // IFormulaEditorHelper
diff --git a/reportdesign/source/ui/misc/UITools.cxx 
b/reportdesign/source/ui/misc/UITools.cxx
index f85721f..7533d84 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -77,9 +77,11 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -1029,7 +1031,14 @@ bool openDialogFormula_nothrow( OUString& 
_in_out_rFormula
 {
 ::boost::shared_ptr< formula::IFunctionManager > 
pFormulaManager(new FunctionManager(xMgr) );
 ReportFormula aFormula( _in_out_rFormula );
-FormulaDialog 
aDlg(pParent,xServiceFactory,pFormulaManager,aFormula.getUndecoratedContent(),_xRowSet);
+
+LanguageTag aLangTag(LANGUAGE_SYSTEM);
+CharClass aCC(_xContext, aLangTag);
+svl::SharedStringPool aStringPool(&aCC);
+
+FormulaDialog aDlg(
+pParent, xServiceFactory, pFormulaManager, 
aFormula.getUndecoratedContent(), _xRowSet, aStringPool);
+
 bSuccess = aDlg.Execute() == RET_OK;
 if ( bSuccess )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-04-14 Thread Stephan Bergmann 
 reportdesign/source/core/api/ReportDefinition.cxx  |6 +++---
 reportdesign/source/core/sdr/UndoEnv.cxx   |   10 ++
 reportdesign/source/filter/xml/xmlFixedContent.cxx |6 +++---
 reportdesign/source/filter/xml/xmlfilter.cxx   |   10 +++---
 reportdesign/source/ui/dlg/AddField.cxx|6 ++
 reportdesign/source/ui/dlg/GroupsSorting.cxx   |4 +---
 reportdesign/source/ui/dlg/Navigator.cxx   |8 +++-
 reportdesign/source/ui/report/DesignView.cxx   |7 ---
 reportdesign/source/ui/report/ReportControllerObserver.cxx |5 ++---
 9 files changed, 23 insertions(+), 39 deletions(-)

New commits:
commit a640be7e2d30462e7115fe6d897b6d5ed3fef9f8
Author: Stephan Bergmann 
Date:   Mon Apr 14 14:21:50 2014 +0200

Clean up function declarations and some unused functions

Change-Id: I367acc372d6b5996430a2c560e776a469b7e0007

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 35260d4..300ea9a 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -121,6 +121,7 @@
 
 #include 
 #include 
+#include 
 #include 
 
 //  page styles
@@ -2409,15 +2410,14 @@ OUString SAL_CALL OReportDefinition::getShapeType(  ) 
throw (uno::RuntimeExcepti
 typedef ::cppu::WeakImplHelper2< container::XNameContainer,
  container::XIndexAccess
 > TStylesBASE;
-class OStylesHelper : public ::cppu::BaseMutex, public TStylesBASE
+class OStylesHelper:
+public cppu::BaseMutex, public TStylesBASE, private boost::noncopyable
 {
 typedef ::std::map< OUString, uno::Any  , ::comphelper::UStringMixLess> 
TStyleElements;
 TStyleElements  m_aElements;
 ::std::vector m_aElementsPos;
 uno::Type   m_aType;
 
-OStylesHelper(const OStylesHelper&);
-void operator =(const OStylesHelper&);
 protected:
 virtual ~OStylesHelper(){}
 public:
diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx 
b/reportdesign/source/core/sdr/UndoEnv.cxx
index 4ce78a9..e39bd24 100644
--- a/reportdesign/source/core/sdr/UndoEnv.cxx
+++ b/reportdesign/source/core/sdr/UndoEnv.cxx
@@ -29,6 +29,7 @@
 #include "RptResId.hrc"
 #include "RptModel.hxx"
 
+#include 
 #include 
 #include 
 #include 
@@ -65,11 +66,6 @@ struct PropertyInfo
 {
 boolbIsReadonlyOrTransient;
 
-PropertyInfo()
-:bIsReadonlyOrTransient( false )
-{
-}
-
 PropertyInfo( const bool i_bIsTransientOrReadOnly )
 :bIsReadonlyOrTransient( i_bIsTransientOrReadOnly )
 {
@@ -94,10 +90,8 @@ typedef ::std::map< Reference< XPropertySet >, ObjectInfo, 
::comphelper::OInterf
 
 
 
-class OXUndoEnvironmentImpl
+class OXUndoEnvironmentImpl: private boost::noncopyable
 {
-OXUndoEnvironmentImpl(OXUndoEnvironmentImpl&);
-void operator =(OXUndoEnvironmentImpl&);
 public:
 OReportModel&   m_rModel;
 PropertySetInfoCachem_aPropertySetCache;
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx 
b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 7fa7397..8f77b44 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -18,6 +18,7 @@
  */
 #include "xmlFixedContent.hxx"
 #include "xmlfilter.hxx"
+#include 
 #include 
 #include 
 #include 
@@ -37,11 +38,10 @@ namespace rptxml
 {
 using namespace ::com::sun::star;
 
-class OXMLCharContent : public XMLCharContext
+class OXMLCharContent: public XMLCharContext, private boost::noncopyable
 {
 OXMLFixedContent* m_pFixedContent;
-OXMLCharContent(const OXMLCharContent&);
-OXMLCharContent operator =(const OXMLCharContent&);
+
 public:
 OXMLCharContent(
 SvXMLImport& rImport,
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx 
b/reportdesign/source/filter/xml/xmlfilter.cxx
index 4690abc..908fd7e 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -16,6 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
+#include 
+
+#include 
 #include 
 #include 
 #include 
@@ -77,11 +81,11 @@ using namespace xmloff;
 
 using namespace ::com::sun::star::util;
 
-class RptMLMasterStylesContext_Impl : public XMLTextMasterStylesContext
+class RptMLMasterStylesContext_Impl:
+public XMLTextMasterStylesContext, private boost::noncopyable
 {
 ORptFilter& m_rImport;
-RptMLMasterStylesContext_Impl(const RptMLMasterStylesContext_Impl&);
-void operator =(const RptMLMasterStylesContext_Impl&);
+
 public:
 
 TYPEINFO_OVERRIDE();
diff --git a/reportdesign/source/ui

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

2013-07-22 Thread Julien Nabet 
 reportdesign/source/core/resource/core_resource.cxx |1 -
 reportdesign/source/core/sdr/ModuleHelper.cxx   |1 -
 2 files changed, 2 deletions(-)

New commits:
commit a4148011836a8be7d23f3f798ee276488f54d31e
Author: Julien Nabet 
Date:   Mon Jul 22 23:19:48 2013 +0200

fdo#46037: no more comphelper/configurationhelper.hxx in reportdesign

Change-Id: I37b885ab3e8976d3e7ee71ee3e723bd2d5f6b973

diff --git a/reportdesign/source/core/resource/core_resource.cxx 
b/reportdesign/source/core/resource/core_resource.cxx
index dab1457..c10b129 100644
--- a/reportdesign/source/core/resource/core_resource.cxx
+++ b/reportdesign/source/core/resource/core_resource.cxx
@@ -22,7 +22,6 @@
 //  needed as long as we have no contexts for components ---
 #include 
 //---
-#include 
 #include 
 #include 
 #include 
diff --git a/reportdesign/source/core/sdr/ModuleHelper.cxx 
b/reportdesign/source/core/sdr/ModuleHelper.cxx
index 375722d..7b16502 100644
--- a/reportdesign/source/core/sdr/ModuleHelper.cxx
+++ b/reportdesign/source/core/sdr/ModuleHelper.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "ModuleHelper.hxx"
-#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-07-09 Thread David Tardon 
 reportdesign/source/core/sdr/RptObject.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6e2815a0ffdb5811f220978734354b1033801927
Author: David Tardon 
Date:   Tue Jul 9 10:40:21 2013 +0200

fdo#66582 avoid crash because of missing model

The SdrObject is still under construction at this point, so it does not
make sense to broadcast changes, because there are not any listeners
anyway.

Change-Id: Ib05e30843b4b0e125d5cae18a481e16fb7e21ba1

diff --git a/reportdesign/source/core/sdr/RptObject.cxx 
b/reportdesign/source/core/sdr/RptObject.cxx
index b2b6d66..3353843 100644
--- a/reportdesign/source/core/sdr/RptObject.cxx
+++ b/reportdesign/source/core/sdr/RptObject.cxx
@@ -150,7 +150,7 @@ SdrObject* OObjectBase::createObject(const uno::Reference< 
report::XReportCompon
 {
 sal_Bool bOpaque = sal_False;
 _xComponent->getPropertyValue(PROPERTY_OPAQUE) >>= bOpaque;
-pNewObj->SetLayer(bOpaque ? RPT_LAYER_FRONT : RPT_LAYER_BACK);
+pNewObj->NbcSetLayer(bOpaque ? RPT_LAYER_FRONT : 
RPT_LAYER_BACK);
 }
 catch(const uno::Exception&)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: reportdesign/source svtools/source

2013-07-03 Thread Lionel Elie Mamane 
 reportdesign/source/core/sdr/RptModel.cxx |2 ++
 reportdesign/source/ui/dlg/AddField.cxx   |2 ++
 svtools/source/contnr/treelistbox.cxx |2 ++
 3 files changed, 6 insertions(+)

New commits:
commit c63b74d22d360893bb9e1200f59099ffb7943705
Author: Lionel Elie Mamane 
Date:   Wed Jul 3 21:34:26 2013 +0200

fdo#61725 add SolarMutex until it works

Change-Id: I757bbfbc4a548f17d797ac00197588bc6e2907f6

diff --git a/reportdesign/source/core/sdr/RptModel.cxx 
b/reportdesign/source/core/sdr/RptModel.cxx
index 9553291..640018b 100644
--- a/reportdesign/source/core/sdr/RptModel.cxx
+++ b/reportdesign/source/core/sdr/RptModel.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "UndoActions.hxx"
 #include "UndoEnv.hxx"
@@ -111,6 +112,7 @@ SdrPage* OReportModel::RemovePage(sal_uInt16 nPgNum)
 // 
-
 OReportPage* OReportModel::createNewPage(const uno::Reference< 
report::XSection >& _xSection)
 {
+SolarMutexGuard aSolarGuard;
 OReportPage* pPage = new OReportPage( *this ,_xSection);
 InsertPage(pPage);
 m_pUndoEnv->AddSection(_xSection);
diff --git a/reportdesign/source/ui/dlg/AddField.cxx 
b/reportdesign/source/ui/dlg/AddField.cxx
index d849d01..bee9548 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -305,6 +305,8 @@ namespace
 //---
 void OAddFieldWindow::Update()
 {
+SolarMutexGuard aSolarGuard;
+
 if ( m_pContainerListener.is() )
 m_pContainerListener->dispose();
 m_pContainerListener = NULL;
diff --git a/svtools/source/contnr/treelistbox.cxx 
b/svtools/source/contnr/treelistbox.cxx
index 10c3c65..3f02d6e 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -3692,6 +3692,8 @@ IMPL_LINK( SvTreeListBox, DefaultCompare, SvSortData*, 
pData )
 void SvTreeListBox::ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* 
pEntry1,
 SvTreeListEntry* pEntry2, sal_uLong nPos )
 {
+SolarMutexGuard aSolarGuard;
+
 if( nActionId == LISTACTION_CLEARING )
 CancelTextEditing();
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-06-11 Thread Stephan Bergmann 
 reportdesign/source/ui/report/SectionWindow.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 85165a18e9f8123d80246bedfad0acd8a314f715
Author: Stephan Bergmann 
Date:   Tue Jun 11 15:36:32 2013 +0200

Lock Solar Mutex in rptui::OSectionWindow::_propertyChanged

 "REPORTBUILDER: 
Crash by
following case 2 from fdo#61725 + click cancel" comment 4 discusses a 
scenario
that leads to a fired DbgTestSolarMutex assertion in --enable-dbgutil 
builds at:

0  0x003c80635ba5 in __GI_raise (sig=sig@entry=6) at 
../nptl/sysdeps/unix/sysv/linux/raise.c:63
1  0x003c80637358 in __GI_abort () at abort.c:90
2  0x003c8062e972 in __assert_fail_base (fmt=0x3c807793e8 "%s%s%s:%u: 
%s%sAssertion `%s' failed.\n%n", assertion=assertion@entry=0x7fcbe332a8b8 
"ImplGetSVData()->mpDefInst->CheckYieldMutex()", file=file@entry=0x7fcbe332a880 
"lo/core/vcl/source/app/dbggui.cxx", line=line@entry=1747, 
function=function@entry=0x7fcbe332b250 
 "void ImplDbgTestSolarMutex()") 
at assert.c:92
3  0x003c8062ea22 in __GI___assert_fail (assertion=0x7fcbe332a8b8 
"ImplGetSVData()->mpDefInst->CheckYieldMutex()", file=0x7fcbe332a880 
"lo/core/vcl/source/app/dbggui.cxx", line=1747, function=0x7fcbe332b250 
 "void ImplDbgTestSolarMutex()") 
at assert.c:101
4  0x7fcbe2bb5ea8 in ImplDbgTestSolarMutex () at 
lo/core/vcl/source/app/dbggui.cxx:1747
5  0x7fcbe4053783 in DbgFunc (nAction=15, pParam=0x0) at 
lo/core/tools/source/debug/debug.cxx:1119
6  0x7fcbe2e75465 in DbgTestSolarMutex () at 
lo/core/include/tools/debug.hxx:295
7  0x7fcbe2e9b213 in OutputDevice::ImplGetGraphics (this=0x1ca8e98) at 
lo/core/vcl/source/gdi/outdev.cxx:554
8  0x7fcbe2e9af4c in OutputDevice::ImplHasMirroredGraphics 
(this=0x1ca8e98) at lo/core/vcl/source/gdi/outdev.cxx:511
9  0x7fcbe3163f1f in Window::ImplPosSizeWindow (this=0x1ca8e98, nX=127, 
nY=1199, nWidth=2318, nHeight=13, nFlags=15) at 
lo/core/vcl/source/window/window.cxx:3286
10 0x7fcbe31737c1 in Window::setPosSizePixel (this=0x1ca8e98, nX=127, 
nY=1199, nWidth=2318, nHeight=13, nFlags=15) at 
lo/core/vcl/source/window/window.cxx:7181
11 0x7fcbe314fa59 in Window::SetPosSizePixel (this=0x1ca8e98, 
rNewPos=Point = {...}, rNewSize=Size = {...}) at 
lo/core/vcl/source/window/window2.cxx:1717
12 0x7fcb8e0cfd2c in rptui::lcl_setScrollBar (_nNewValue=2318, 
_aPos=Point = {...}, _aSize=Size = {...}, _rScrollBar=...) at 
lo/core/reportdesign/source/ui/report/ScrollHelper.cxx:38
13 0x7fcb8e0d0b41 in rptui::OScrollWindowHelper::ResizeScrollBars 
(this=0x1ca8cb0) at lo/core/reportdesign/source/ui/report/ScrollHelper.cxx:169
14 0x7fcb8e0d0c72 in rptui::OScrollWindowHelper::Resize 
(this=0x1ca8cb0) at lo/core/reportdesign/source/ui/report/ScrollHelper.cxx:182
15 0x7fcb8e0d0665 in rptui::OScrollWindowHelper::setTotalSize 
(this=0x1ca8cb0, _nWidth=1186, _nHeight=464) at 
lo/core/reportdesign/source/ui/report/ScrollHelper.cxx:110
16 0x7fcb8e0cefba in rptui::OReportWindow::notifySizeChanged 
(this=0x1ca96c0) at lo/core/reportdesign/source/ui/report/ReportWindow.cxx:255
17 0x7fcb8e0d3920 in rptui::OSectionWindow::_propertyChanged 
(this=0x21688a0, _rEvent=...) at 
lo/core/reportdesign/source/ui/report/SectionWindow.cxx:127
18 0x7fcbe7271dfb in 
comphelper::OPropertyChangeMultiplexer::propertyChange (this=0x7fcb8c1f2668, 
_rEvent=...) at lo/core/comphelper/source/property/propmultiplex.cxx:154
19 0x7fcbe6b0be20 in cppu::PropertySetMixinImpl::BoundListeners::notify 
(this=0x7fff42dd9780) at lo/core/cppuhelper/source/propertysetmixin.cxx:399
20 0x7fcb8ed52b50 in reportdesign::OSection::set 
(this=0x7fcbd0199020, _sProperty="Height", _Value=@0x7fff42dd9804: 0, 
_member=@0x7fcbd0199170: 0) at 
lo/core/reportdesign/source/core/inc/Section.hxx:96
21 0x7fcb8ed4e2e2 in reportdesign::OSection::setHeight 
(this=0x7fcbd0199020, _height=0) at 
lo/core/reportdesign/source/core/api/Section.cxx:255
22 0x7fcbd42877de in gcc3::callVirtualMethod(void*, unsigned int, 
void*, _typelib_TypeDescriptionReference*, bool, unsigned long*, unsigned int, 
unsigned long*, unsigned int, double*, unsigned int) () from 
lo/core/solver/unxlngx6/installation/opt/ure/lib/libgcc3_uno.so
23 0x7fcbd428681a in cpp_call (pThis=0x202ea90, aVtableSlot=..., 
pReturnTypeRef=0x711840, nParams=1, pParams=0x7fff42dd9bc0, pUnoReturn=0x0, 
pUnoArgs=0x7fff42dd9c80, ppUnoExc=0x7fff42dd9d48) at 
lo/core/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:237
24 0x7fcbd4286fa8 in 
bridges::cpp_uno::shared::unoInterfaceProxyDispatch (pUnoI=0x202ea90, 
pMemberDescr=0x1e28590, pReturn=0x0, pArgs=0x7fff42dd9c80, 
ppException=0x7fff42dd9d48) at 
lo/core/bridges/source/cpp_uno/gcc3_linux_x86-64/uno2cpp.cxx:368
25 0x7fcb9d498480 in jni_uno::Bridge::call_uno (this=0x1609c90, 
jni=..., pUnoI=0x202ea

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

2013-04-24 Thread Tor Lillqvist 
 reportdesign/source/ui/misc/RptUndo.cxx|4 ++--
 reportdesign/source/ui/report/ReportController.cxx |2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 10bd0604194db9e42fe76adab4ca17a6c7d0ac7c
Author: Tor Lillqvist 
Date:   Wed Apr 24 16:41:09 2013 +0300

Fix MSVC build: A ? : operator doesn't automagically construct an OUString

Change-Id: I0bf2dcd24a7b59682c90a8910279117f1bf0467f

diff --git a/reportdesign/source/ui/misc/RptUndo.cxx 
b/reportdesign/source/ui/misc/RptUndo.cxx
index 6a28072..82ed522 100644
--- a/reportdesign/source/ui/misc/RptUndo.cxx
+++ b/reportdesign/source/ui/misc/RptUndo.cxx
@@ -299,7 +299,7 @@ void OGroupSectionUndo::implReInsert( )
 {
 uno::Sequence< beans::PropertyValue > aArgs(2);
 
-aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? PROPERTY_HEADERON 
: PROPERTY_FOOTERON;
+aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? 
OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON);
 aArgs[0].Value <<= sal_True;
 aArgs[1].Name = PROPERTY_GROUP;
 aArgs[1].Value <<= m_aGroupHelper.getGroup();
@@ -318,7 +318,7 @@ void OGroupSectionUndo::implReRemove( )
 
 uno::Sequence< beans::PropertyValue > aArgs(2);
 
-aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? PROPERTY_HEADERON 
: PROPERTY_FOOTERON;
+aArgs[0].Name = SID_GROUPHEADER_WITHOUT_UNDO == m_nSlot? 
OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON);
 aArgs[0].Value <<= sal_False;
 aArgs[1].Name = PROPERTY_GROUP;
 aArgs[1].Value <<= m_aGroupHelper.getGroup();
diff --git a/reportdesign/source/ui/report/ReportController.cxx 
b/reportdesign/source/ui/report/ReportController.cxx
index bd4fde8..27c76ab 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3900,7 +3900,7 @@ void OReportController::createGroupSection(const bool 
_bUndo,const bool _bHeader
 if ( m_xReportDefinition.is() )
 {
 const SequenceAsHashMap aMap(_aArgs);
-const sal_Bool bSwitchOn = aMap.getUnpackedValueOrDefault(_bHeader ? 
PROPERTY_HEADERON : PROPERTY_FOOTERON,sal_False);
+const sal_Bool bSwitchOn = aMap.getUnpackedValueOrDefault(_bHeader ? 
OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON), sal_False);
 uno::Reference< report::XGroup> xGroup = 
aMap.getUnpackedValueOrDefault(PROPERTY_GROUP,uno::Reference< 
report::XGroup>());
 if ( xGroup.is() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-04-22 Thread Miklos Vajna 
 reportdesign/source/core/api/ReportDefinition.cxx |  127 ++
 1 file changed, 63 insertions(+), 64 deletions(-)

New commits:
commit 60a466c0363eaa9b2692323f4d2ac98683366c3b
Author: Miklos Vajna 
Date:   Mon Apr 22 13:00:15 2013 +0200

remove no longer needed MAP_CHAR_LEN macro

Change-Id: I591d37c6f43abaaaba124d511fa5767be280481e

diff --git a/reportdesign/source/core/api/ReportDefinition.cxx 
b/reportdesign/source/core/api/ReportDefinition.cxx
index 0186ead..72fe9a6 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -124,7 +124,6 @@
 #include 
 
 #define MAP_LEN(x) x, sizeof(x) - 1
-#define MAP_CHAR_LEN(x) OUString(RTL_CONSTASCII_USTRINGPARAM(x))
 //  page styles
 #define SC_UNO_PAGE_LEFTBORDER  "LeftBorder"
 #define SC_UNO_PAGE_RIGHTBORDER "RightBorder"
@@ -313,84 +312,84 @@ OStyle::OStyle()
 
 registerPropertyNoMember(PROPERTY_BACKGRAPHICLOCATION,  
++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
 registerPropertyNoMember(PROPERTY_BACKTRANSPARENT,  
++i,nBound,::getBooleanCppuType() ,&bTrue);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BORDERDIST),  
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBORDER),  
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_BOTTBRDDIST), 
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
+registerPropertyNoMember(SC_UNO_PAGE_BORDERDIST,  
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
+registerPropertyNoMember(SC_UNO_PAGE_BOTTBORDER,  
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
+registerPropertyNoMember(SC_UNO_PAGE_BOTTBRDDIST, 
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
 registerPropertyNoMember(PROPERTY_BOTTOMMARGIN, 
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nMargin);
-registerPropertyNoMember(MAP_CHAR_LEN("DisplayName"),   
++i,nBound,::getCppuType((OUString*)0) ,&sEmpty);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKCOL),  
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nTransparent);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFFILT),  
++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFLOC),   
++i,nBound,::getCppuType((const style::GraphicLocation*)0) ,&eGraphicLocation);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRGRFURL),   
++i,nBound,::getCppuType((const OUString*)0) ,&sEmpty);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBACKTRAN), 
++i,nBound,::getBooleanCppuType() ,&bTrue);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBODYDIST), 
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBRDDIST),  
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBOR),  
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRBOTTBDIS), 
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRHEIGHT),   
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRDYNAMIC),  
++i,nBound,::getBooleanCppuType() ,&bFalse);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRON),   
++i,nBound,::getBooleanCppuType() ,&bFalse);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHARED),   
++i,nBound,::getBooleanCppuType() ,&bFalse);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBOR),  
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTBDIS), 
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRLEFTMAR),  
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBOR), 
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
-
registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTBDIS),++i,nBound,::getCppuType((const
 sal_Int32*)0) ,&nZero);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRRIGHTMAR), 
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRSHADOW),   
++i,nBound,::getCppuType((const table::ShadowFormat*)0) ,&eShadowFormat);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBOR),   
++i,nBound,::getCppuType((const table::BorderLine*)0) ,&eBorderLine);
-registerPropertyNoMember(MAP_CHAR_LEN(SC_UNO_PAGE_FTRTOPBDIS),  
++i,nBound,::getCppuType((const sal_Int32*)0) ,&nZero);
+registerPropertyNoMember("Di

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

2013-03-23 Thread Julien Nabet 
 reportdesign/source/filter/xml/xmlControlProperty.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4eda900b8391c691445ab460ffad196132bc394e
Author: Julien Nabet 
Date:   Sat Mar 23 21:03:44 2013 +0100

Related coverity#704244 Logically dead code

Change-Id: I5a008c56c1318c9271d4487b2b7ad3c4a80c02a6

diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx 
b/reportdesign/source/filter/xml/xmlControlProperty.cxx
index f3fbc12..b5a021c 100644
--- a/reportdesign/source/filter/xml/xmlControlProperty.cxx
+++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx
@@ -265,7 +265,7 @@ Any OXMLControlProperty::convertString(const 
::com::sun::star::uno::Type& _rExpe
 nType = TYPE_TIME;
 else if ( _rExpectedType.equals(s_aDateTimeType) )
 nType = TYPE_DATETIME;
-if ( !nType )
+if ( nType )
 {
 // first extract the double
 double nValue = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2013-02-14 Thread Stephan Bergmann 
 reportdesign/source/ui/inspection/metadata.cxx |   10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 5cd036c0742f8be8d6fc34f7e3a983cae557d94b
Author: Stephan Bergmann 
Date:   Thu Feb 14 18:29:58 2013 +0100

multiple unsequenced modifications to 'nPos' [-Werror,-Wunsequenced]

...where the nPos wasn't actually used, anyway.

Change-Id: Id5e2e37acd2a7cc191030a1ec959894d3ec1943f

diff --git a/reportdesign/source/ui/inspection/metadata.cxx 
b/reportdesign/source/ui/inspection/metadata.cxx
index 40ba8a9..b80d19f 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -44,26 +44,23 @@ namespace rptui
 String  sTranslation;
 rtl::OStringsHelpId;
 sal_Int32   nId;
-sal_uInt16  nPos;
 sal_uInt32  nUIFlags;
 
 OPropertyInfoImpl(
 const ::rtl::OUString&  rName,
 sal_Int32   _nId,
 const String&   aTranslation,
-sal_uInt16  nPosId,
 const rtl::OString& _sHelpId,
 sal_uInt32  _nUIFlags);
 };
 
 //
 OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString& _rName, 
sal_Int32 _nId,
-   const String& aString, sal_uInt16 nP, const 
rtl::OString& sHid, sal_uInt32 _nUIFlags)
+   const String& aString, const rtl::OString& 
sHid, sal_uInt32 _nUIFlags)
:sName(_rName)
,sTranslation(aString)
,sHelpId(sHid)
,nId(_nId)
-   ,nPos(nP)
,nUIFlags(_nUIFlags)
 {
 }
@@ -83,7 +80,7 @@ namespace rptui
 //
 #define DEF_INFO( ident, uinameres, helpid, flags )   \
 OPropertyInfoImpl( PROPERTY_##ident, PROPERTY_ID_##ident, \
-String( ModuleRes( RID_STR_##uinameres ) ), nPos++, 
HID_RPT_PROP_##helpid, flags )
+String( ModuleRes( RID_STR_##uinameres ) ), HID_RPT_PROP_##helpid, 
flags )
 
 #define DEF_INFO_1( ident, uinameres, helpid, flag1 ) \
 DEF_INFO( ident, uinameres, helpid, PROP_FLAG_##flag1 )
@@ -111,7 +108,6 @@ namespace rptui
 OModuleClient aResourceAccess;
 // this ensures that we have our resource file loaded
 
-sal_uInt16 nPos = 1;
 static OPropertyInfoImpl aPropertyInfos[] =
 {
 /*
@@ -202,7 +198,7 @@ namespace rptui
 // intialisierung
 if(!s_pPropertyInfos)
 getPropertyInfo();
-OPropertyInfoImpl  aSearch(_rName, 0L, String(), 0, "", 0);
+OPropertyInfoImpl  aSearch(_rName, 0L, String(), "", 0);
 
 const OPropertyInfoImpl* pPropInfo = ::std::lower_bound(
 s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch, 
PropertyInfoLessByName() );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

<    1   2