LibreOffice Gerrit News 2013-09-04

[gerrit]

Moin!

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

+ improve performance of copyArea in Ios
  in https://gerrit.libreoffice.org/5707 from Tsahi Glik @ CloudOn
+ writerfilter: corrected define for debug output
  in https://gerrit.libreoffice.org/5800 from Andres Gomez
+ vcl/pdfwriter: export linear/axial gradients as PDF gradients
  in https://gerrit.libreoffice.org/5799 from Pierre-Eric Pelloux-Prayer
+ Print images in grayscale when printing using the "Black & White".
  in https://gerrit.libreoffice.org/5798 from Brian Fraser
+ Use the user specific tmp directory for firebird.
  in https://gerrit.libreoffice.org/5797 from Andrzej J.R. Hunt
+ delete code that was commented out
  in https://gerrit.libreoffice.org/5795 from Philipp Riemer
+ adjust code to layout
  in https://gerrit.libreoffice.org/5794 from Philipp Riemer
+ fdo#39468: Translate German comments (first part) in include/svl/filerec.
  in https://gerrit.libreoffice.org/5793 from Philipp Riemer
+ remove filerec.hxx inclusion where not needed
  in https://gerrit.libreoffice.org/5792 from Philipp Riemer
+ String to OUString
  in https://gerrit.libreoffice.org/5790 from Thomas Arnhold
+ calc export test on cell values, strings & formulas
  in https://gerrit.libreoffice.org/5698 from Laurent Godard
+ Remove more unused methods
  in https://gerrit.libreoffice.org/5789 from Marcos Souza
+ Windows registry configuration backend
  in https://gerrit.libreoffice.org/5770 from Janos Farago
+ svx: new InteropGrabBag UNO prop in Shape service
  in https://gerrit.libreoffice.org/5769 from Andres Gomez
+ oox: Enhancing the debugging output
  in https://gerrit.libreoffice.org/5768 from Andres Gomez


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

+ Upgrade the bundled OpenSSL to 1.0.1e
  in https://gerrit.libreoffice.org/5718 from Tor Lillqvist
+ XubString->OUString
  in https://gerrit.libreoffice.org/5782 from Caolán McNamara
+ String to OUString
  in https://gerrit.libreoffice.org/5776 from Matteo Casalin
+ fdo#68877: Select "" as Elements window do
  in https://gerrit.libreoffice.org/5780 from Marcos Souza
+ Fix HTML closing tags order for slide notes.
  in https://gerrit.libreoffice.org/5771 from Artur Dryomov
+ startcenter: Add tooltips for thumbnails with long filenames
  in https://gerrit.libreoffice.org/5756 from Krisztian Pinter
+ Remove more unused methods
  in https://gerrit.libreoffice.org/5757 from Marcos Souza


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

None

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

+ fdo#36791 : fix for import of greeting card
  in https://gerrit.libreoffice.org/4240 from Adam CloudOn
+ fdo#66401: fix for combined characters
  in https://gerrit.libreoffice.org/5018 from Adam CloudOn
+ more debug logs, extra debug layer, file is not used in p3k
  in https://gerrit.libreoffice.org/5267 from James Michael Dupont
+  fdo#66279 - MathML export: use the operator dictionary
  in https://gerrit.libreoffice.org/4671 from Frédéric Wang
+ Remove old outdated gallery images and sounds
  in https://gerrit.libreoffice.org/4993 from Samuel Mehrbrodt
+ fix for text watermark
  in https://gerrit.libreoffice.org/5568 from Adam CloudOn
+ Don't use osl_createSuspendedThread anymore
  in https://gerrit.libreoffice.org/5565 from Arnaud Versini
+ Positional Tab additions
  in https://gerrit.libreoffice.org/5387 from Adam CloudOn
+ Change oslThreadIdentifier to uintptr_t and use THREAD_VALUE on Unix.
  in https://gerrit.libreoffice.org/5553 from Arnaud Versini
+ fdo#64817 : fix for rectangle with image fill
  in https://gerrit.libreoffice.org/4718 from Adam CloudOn
+ fdo#66577: non-fractional widths with Core Text
  in https://gerrit.libreoffice.org/5023 from Khaled Hosny


Best,

Your friendly LibreOffice Gerrit Digest Mailer

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

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

[Tor Lillqvist]

 basic/source/runtime/dllmgr-x64.cxx |2 +-
 basic/source/runtime/dllmgr-x86.cxx |2 +-
 scaddins/source/analysis/analysishelper.cxx |4 
 scaddins/source/analysis/financial.cxx  |   20 
 4 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 853167931600777e7bf44a35e051628a1169bcfc
Author: Tor Lillqvist 
Date:   Wed Sep 4 08:54:21 2013 +0300

WaE: unreachable code

Noticed during inlining at link-time code generation phase: The called
function always throws. So let's hardcode the throw for now then at
the callsite instead. Not ideal, I know. Add comments describing what
is going on.

Change-Id: I60d14b25aa62846fc0314aad7e00b2990f4cff26

diff --git a/scaddins/source/analysis/analysishelper.cxx 
b/scaddins/source/analysis/analysishelper.cxx
index 05b6bbf..0012231 100644
--- a/scaddins/source/analysis/analysishelper.cxx
+++ b/scaddins/source/analysis/analysishelper.cxx
@@ -1068,6 +1068,8 @@ double GetOddfprice( sal_Int32 /*nNullDate*/, sal_Int32 
/*nSettle*/, sal_Int32 /
 sal_Int32 /*nFirstCoup*/, double /*fRate*/, double /*fYield*/, double 
/*fRedemp*/, sal_Int32 /*nFreq*/,
 sal_Int32 /*nBase*/ ) throw( uno::RuntimeException, 
lang::IllegalArgumentException )
 {
+// If you ever change this to not unconditionally throw, adapt
+// getOddfprice() (note lower-case 'g') in financial.cxx.
 throw uno::RuntimeException();  // #87380#
 }
 
@@ -1151,6 +1153,8 @@ double GetOddfyield( sal_Int32 /*nNullDate*/, sal_Int32 
/*nSettle*/, sal_Int32 /
 sal_Int32 /*nFirstCoup*/, double /*fRate*/, double /*fPrice*/, double 
/*fRedemp*/, sal_Int32 /*nFreq*/,
 sal_Int32 /*nBase*/ ) throw( uno::RuntimeException, 
lang::IllegalArgumentException )
 {
+// Ditto here, if you change this to not throw unconditionally,
+// adapt getOddfyield() in financial.cxx.
 throw uno::RuntimeException();  // #87380#
 }
 
diff --git a/scaddins/source/analysis/financial.cxx 
b/scaddins/source/analysis/financial.cxx
index dd637c6..a34591a 100644
--- a/scaddins/source/analysis/financial.cxx
+++ b/scaddins/source/analysis/financial.cxx
@@ -403,8 +403,20 @@ double SAL_CALL AnalysisAddIn::getOddfprice( const 
css::uno::Reference< css::bea
 if( fRate < 0.0 || fYield < 0.0 || CHK_Freq || nMat <= nFirstCoup || 
nFirstCoup <= nSettle || nSettle <= nIssue )
 throw css::lang::IllegalArgumentException();
 
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
 double fRet = GetOddfprice( GetNullDate( xOpt ), nSettle, nMat, nIssue, 
nFirstCoup, fRate, fYield, fRedemp, nFreq, getDateMode( xOpt, rOB ) );
 RETURN_FINITE( fRet );
+#else
+// During link-time optimization the compiler inlines the above
+// call to GetOddfprice() (note upper-case 'G') (from
+// analysishelper.cxx), and notices that GetOddfprice() always
+// throws, so the assignment and return are unreachable. Avoid
+// that warning by throwing directly here.
+(void) rOB;
+(void) fRedemp;
+(void) xOpt;
+throw css::uno::RuntimeException();
+#endif
 }
 
 
@@ -415,9 +427,17 @@ double SAL_CALL AnalysisAddIn::getOddfyield( const 
css::uno::Reference< css::bea
 if( fRate < 0.0 || fPrice <= 0.0 || CHK_Freq || nMat <= nFirstCoup || 
nFirstCoup <= nSettle || nSettle <= nIssue )
 throw css::lang::IllegalArgumentException();
 
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
 double fRet = GetOddfyield( GetNullDate( xOpt ), nSettle, nMat, nIssue, 
nFirstCoup, fRate, fPrice, fRedemp, nFreq,
 getDateMode( xOpt, rOB ) );
 RETURN_FINITE( fRet );
+#else
+// Same story here, see comment in getOddfprice()
+(void) rOB;
+(void) fRedemp;
+(void) xOpt;
+throw css::uno::RuntimeException();
+#endif
 }
 
 
commit 37f1a6d35acd13ab356323637ecb2c8de076bf1c
Author: Tor Lillqvist 
Date:   Wed Sep 4 02:10:58 2013 +0300

WaE: use number() instead of valueOf()

Change-Id: Ic45dc030f76531d202a12e227130d11d3d1de805

diff --git a/basic/source/runtime/dllmgr-x64.cxx 
b/basic/source/runtime/dllmgr-x64.cxx
index 7d3e291..d172833 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -624,7 +624,7 @@ SbError getProcData(HMODULE handle, OUString const & name, 
ProcData * proc)
 }
 FARPROC p = GetProcAddress(handle, reinterpret_cast< LPCSTR >(n));
 if (p != 0) {
-proc->name = OString("#") + OString::valueOf(n);
+proc->name = OString("#") + OString::number(n);
 proc->proc = p;
 return ERRCODE_NONE;
 }
diff --git a/basic/source/runtime/dllmgr-x86.cxx 
b/basic/source/runtime/dllmgr-x86.cxx
index 2bfd037..60b3027 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -579,7 +579,7 @@ SbError getProcData(HMODULE handle, OUString const & name, 
ProcData * proc)
 }
 FARPROC p = GetProcAddress(handle, reinterpret_cast< 

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

[Minh Ngo]

 avmedia/source/vlc/wrapper/Player.hxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit b21781864dbc402d2a4fa7e6c6ce29cd4fa2b835
Author: Minh Ngo 
Date:   Wed Sep 4 07:19:16 2013 +0300

Possibly fixes compiling success regression on the UNIX platform.

Change-Id: Ie46bba2bbe8e351c25ae2c207fad9cc73761dd46

diff --git a/avmedia/source/vlc/wrapper/Player.hxx 
b/avmedia/source/vlc/wrapper/Player.hxx
index 68e4f44..3413e95 100644
--- a/avmedia/source/vlc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/wrapper/Player.hxx
@@ -9,6 +9,9 @@
 
 #ifndef _WRAPPER_PLAYER_HXX
 #define _WRAPPER_PLAYER_HXX
+#if defined UNX
+# include 
+#endif
 
 struct libvlc_media_player_t;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 chart2/source/view/diagram/VDiagram.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33b49a0d4e8b91fd170753ea9fd46dde67a8b686
Author: Kohei Yoshida 
Date:   Tue Sep 3 23:53:54 2013 -0400

Don't forget this.

Change-Id: I37cb3e43bc7637ba0b749cb6b6671416e979b86b

diff --git a/chart2/source/view/diagram/VDiagram.cxx 
b/chart2/source/view/diagram/VDiagram.cxx
index b91637d..58bb49f 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -91,7 +91,7 @@ VDiagram::~VDiagram()
 void VDiagram::init(
 const uno::Reference< drawing::XShapes >& xTarget, const uno::Reference< 
lang::XMultiServiceFactory >& xFactory )
 {
-OSL_PRECOND(xLogicTarget.is() && xFactory.is(), "no proper initialization 
parameters");
+OSL_PRECOND(xFactory.is(), "no proper initialization parameters");
 
 m_xTarget  = xTarget;
 m_xShapeFactory = xFactory;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Kohei Yoshida]

 chart2/source/inc/chartview/DrawModelWrapper.hxx |9 +
 chart2/source/view/diagram/VDiagram.cxx  |8 +++-
 chart2/source/view/inc/VDiagram.hxx  |   11 +--
 chart2/source/view/main/DrawModelWrapper.cxx |   17 ++---
 4 files changed, 19 insertions(+), 26 deletions(-)

New commits:
commit 4a44d51c999769bd548cf2d9b7d8f844e1ae1ae9
Author: Kohei Yoshida 
Date:   Tue Sep 3 22:21:02 2013 -0400

std::auto_ptr is deprecated.

Change-Id: I99f619393abc9e2fa7a38a8176084989d063a9ae

diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx 
b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index dc612dc..d58714c 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -31,6 +31,8 @@
 #include 
 #include "chartviewdllapi.hxx"
 
+#include 
+
 namespace chart
 {
 
@@ -42,7 +44,7 @@ private:
 ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > 
m_xMainDrawPage;
 ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > 
m_xHiddenDrawPage;
 
-std::auto_ptr< OutputDevice > m_apRefDevice;
+boost::scoped_ptr m_pRefDevice;
 
 //no default constructor
 DrawModelWrapper();
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx 
b/chart2/source/view/main/DrawModelWrapper.cxx
index 2f6606a..c5ad39d 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -107,7 +107,6 @@ DrawModelWrapper::DrawModelWrapper( const 
uno::Reference
 , m_pChartItemPool(0)
 , m_xMainDrawPage(0)
 , m_xHiddenDrawPage(0)
-, m_apRefDevice(0)
 {
 m_pChartItemPool = ChartItemPool::CreateChartItemPool();
 
@@ -163,12 +162,12 @@ DrawModelWrapper::DrawModelWrapper( const 
uno::Reference
 OutputDevice* pDefaultDevice = rOutliner.GetRefDevice();
 if( !pDefaultDevice )
 pDefaultDevice = Application::GetDefaultDevice();
-m_apRefDevice = std::auto_ptr< OutputDevice >( new VirtualDevice( 
*pDefaultDevice ) );
-MapMode aMapMode = m_apRefDevice->GetMapMode();
+m_pRefDevice.reset(new VirtualDevice(*pDefaultDevice));
+MapMode aMapMode = m_pRefDevice->GetMapMode();
 aMapMode.SetMapUnit(MAP_100TH_MM);
-m_apRefDevice->SetMapMode(aMapMode);
-SetRefDevice(m_apRefDevice.get());
-rOutliner.SetRefDevice(m_apRefDevice.get());
+m_pRefDevice->SetMapMode(aMapMode);
+SetRefDevice(m_pRefDevice.get());
+rOutliner.SetRefDevice(m_pRefDevice.get());
 }
 
 DrawModelWrapper::~DrawModelWrapper()
commit 44cfb3c3bcb5a84191d3935b1def9e09d7ba3ab3
Author: Kohei Yoshida 
Date:   Tue Sep 3 22:17:17 2013 -0400

Service manager class member not used. Remove it.

Change-Id: I1734fb6aa100f25e317e15f678f7582353283e73

diff --git a/chart2/source/inc/chartview/DrawModelWrapper.hxx 
b/chart2/source/inc/chartview/DrawModelWrapper.hxx
index 34646a5..dc612dc 100644
--- a/chart2/source/inc/chartview/DrawModelWrapper.hxx
+++ b/chart2/source/inc/chartview/DrawModelWrapper.hxx
@@ -37,7 +37,6 @@ namespace chart
 class OOO_DLLPUBLIC_CHARTVIEW DrawModelWrapper : private SdrModel
 {
 private:
-::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiComponentFactory > m_xMCF;
 SfxItemPool* m_pChartItemPool;
 
 ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > 
m_xMainDrawPage;
@@ -49,8 +48,8 @@ private:
 DrawModelWrapper();
 
 public:
-SAL_DLLPRIVATE DrawModelWrapper(::com::sun::star::uno::Reference<
-   ::com::sun::star::uno::XComponentContext > const & xContext );
+SAL_DLLPRIVATE DrawModelWrapper(
+const 
com::sun::star::uno::Reference& 
xContext );
 SAL_DLLPRIVATE virtual ~DrawModelWrapper();
 
 ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory > getShapeFactory();
diff --git a/chart2/source/view/main/DrawModelWrapper.cxx 
b/chart2/source/view/main/DrawModelWrapper.cxx
index 2a0abf1..2f6606a 100644
--- a/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/chart2/source/view/main/DrawModelWrapper.cxx
@@ -102,10 +102,8 @@ OutputDevice * lcl_GetParentRefDevice( const 
uno::Reference< frame::XModel > & x
 namespace chart
 {
 
-DrawModelWrapper::DrawModelWrapper(
-uno::Reference const & xContext )
+DrawModelWrapper::DrawModelWrapper( const 
uno::Reference& /*xContext*/ )
 : SdrModel( SvtPathOptions().GetPalettePath() )
-, m_xMCF(0)
 , m_pChartItemPool(0)
 , m_xMainDrawPage(0)
 , m_xHiddenDrawPage(0)
@@ -113,8 +111,6 @@ DrawModelWrapper::DrawModelWrapper(
 {
 m_pChartItemPool = ChartItemPool::CreateChartItemPool();
 
-m_xMCF = xContext->getServiceManager();
-
 SetScaleUnit(MAP_100TH_MM);
 SetScaleFraction(Fraction(1, 1));
 SetDefaultFontHeight(423); // 12pt
commit 302a966f5485578d87872699ef9c90fc173c1600
Author: Kohei Yoshida 
Date:   Tue Sep 3 21:43:44 2013 -0400

bool cleanu

Re: SOLVED: build warnings: ... unsigned only in ISO C90

[Terrence Enger]

Of course, I mean the build is proceeding *without* the warnings.

/me slaps forehead.
Terry.




--
View this message in context: 
http://nabble.documentfoundation.org/subject-build-warnings-unsigned-only-in-ISO-C90-tp4072690p4072891.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Kohei Yoshida]

 chart2/source/view/diagram/VDiagram.cxx |   24 ++--
 chart2/source/view/inc/VDiagram.hxx |   12 
 chart2/source/view/main/ChartView.cxx   |2 +-
 3 files changed, 15 insertions(+), 23 deletions(-)

New commits:
commit 8cdea5e1028edff0b5b16186f31dadcc32aa2d19
Author: Kohei Yoshida 
Date:   Tue Sep 3 20:07:50 2013 -0400

No point having two separate drawing targets - final target not used.

Let's just keep one target m_xTarget.

Change-Id: Ic9b14179a44371bbc667bd5d851b5d3d8d331eb3

diff --git a/chart2/source/view/diagram/VDiagram.cxx 
b/chart2/source/view/diagram/VDiagram.cxx
index c8efd6a..92b7162 100644
--- a/chart2/source/view/diagram/VDiagram.cxx
+++ b/chart2/source/view/diagram/VDiagram.cxx
@@ -51,8 +51,7 @@ VDiagram::VDiagram(
 const uno::Reference< XDiagram > & xDiagram
 , const drawing::Direction3D& rPreferredAspectRatio
 , sal_Int32 nDimension, sal_Bool bPolar )
-: m_xLogicTarget(NULL)
-, m_xFinalTarget(NULL)
+: m_xTarget(NULL)
 , m_xShapeFactory(NULL)
 , m_pShapeFactory(NULL)
 , m_xOuterGroupShape(NULL)
@@ -92,14 +91,11 @@ VDiagram::~VDiagram()
 }
 
 void VDiagram::init(
-const uno::Reference< drawing::XShapes >& xLogicTarget
-  , const uno::Reference< drawing::XShapes >& xFinalTarget
-  , const uno::Reference< lang::XMultiServiceFactory >& xFactory )
+const uno::Reference< drawing::XShapes >& xTarget, const uno::Reference< 
lang::XMultiServiceFactory >& xFactory )
 {
-OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xFactory.is(),"no proper 
initialization parameters");
+OSL_PRECOND(xLogicTarget.is() && xFactory.is(), "no proper initialization 
parameters");
 
-m_xLogicTarget  = xLogicTarget;
-m_xFinalTarget  = xFinalTarget;
+m_xTarget  = xTarget;
 m_xShapeFactory = xFactory;
 m_pShapeFactory = new ShapeFactory(xFactory);
 }
@@ -157,12 +153,12 @@ void VDiagram::createShapes( const awt::Point& rPos, 
const awt::Size& rSize )
 
 void VDiagram::createShapes_2d()
 {
-
OSL_PRECOND(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is(),"is
 not proper initialized");
-
if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is()))
+OSL_PRECOND(m_pShapeFactory && m_xTarget.is() && m_xShapeFactory.is(), "is 
not proper initialized");
+if (!m_pShapeFactory || !m_xTarget.is() || !m_xShapeFactory.is())
 return;
 
 //create group shape
-uno::Reference< drawing::XShapes > xOuterGroup_Shapes = 
m_pShapeFactory->createGroup2D(m_xLogicTarget);
+uno::Reference< drawing::XShapes > xOuterGroup_Shapes = 
m_pShapeFactory->createGroup2D(m_xTarget);
 m_xOuterGroupShape = uno::Reference( xOuterGroup_Shapes, 
uno::UNO_QUERY );
 
 uno::Reference< drawing::XShapes > xGroupForWall( 
m_pShapeFactory->createGroup2D(xOuterGroup_Shapes,"PlotAreaExcludingAxes") );
@@ -478,8 +474,8 @@ void VDiagram::adjustAspectRatio3d( const awt::Size& 
rAvailableSize )
 
 void VDiagram::createShapes_3d()
 {
-
OSL_PRECOND(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is(),"is
 not proper initialized");
-
if(!(m_pShapeFactory&&m_xLogicTarget.is()&&m_xFinalTarget.is()&&m_xShapeFactory.is()))
+OSL_PRECOND(m_pShapeFactory && m_xTarget.is() && m_xShapeFactory.is(), "is 
not proper initialized");
+if (!m_pShapeFactory || !m_xTarget.is() || !m_xShapeFactory.is())
 return;
 
 //create shape
@@ -487,7 +483,7 @@ void VDiagram::createShapes_3d()
 m_xShapeFactory->createInstance(
 "com.sun.star.drawing.Shape3DSceneObject" ), uno::UNO_QUERY );
 ShapeFactory::setShapeName( m_xOuterGroupShape, "PlotAreaExcludingAxes" );
-m_xLogicTarget->add(m_xOuterGroupShape);
+m_xTarget->add(m_xOuterGroupShape);
 
 uno::Reference< drawing::XShapes > xOuterGroup_Shapes =
 uno::Reference( m_xOuterGroupShape, 
uno::UNO_QUERY );
diff --git a/chart2/source/view/inc/VDiagram.hxx 
b/chart2/source/view/inc/VDiagram.hxx
index cc4603b..5659354 100644
--- a/chart2/source/view/inc/VDiagram.hxx
+++ b/chart2/source/view/inc/VDiagram.hxx
@@ -45,11 +45,9 @@ public: //methods
 , sal_Int32 nDimension=3, sal_Bool bPolar=sal_False );
 virtual ~VDiagram();
 
-void init( const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShapes >& xLogicTarget
- , const ::com::sun::star::uno::Reference<
- ::com::sun::star::drawing::XShapes >& xFinalTarget
- , const ::com::sun::star::uno::Reference< 
::com::sun::star::lang::XMultiServiceFactory >& xFactory);
+void init(
+const 
com::sun::star::uno::Reference& xTarget,
+const 
com::sun::star::uno::Reference& 
xFactory );
 
 voidcreateShapes( const ::com::sun::star::awt::Point& rPos
 , const ::com::sun::star::awt::Size& rSize );
@@ -81,9 +79,7 @@ p

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

[Tor Lillqvist]

 connectivity/source/commontools/BlobHelper.cxx |4 +
 connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx |   20 
 connectivity/source/sdbcx/VUser.cxx|4 +
 extensions/source/ole/unoconversionutilities.hxx   |   24 
+-
 extensions/source/ole/unoobjw.cxx  |2 
 5 files changed, 41 insertions(+), 13 deletions(-)

New commits:
commit aa4868de78b3a3893722f7a079f4d05e18abd8db
Author: Tor Lillqvist 
Date:   Wed Sep 4 01:37:58 2013 +0300

WaE: Unreachable code

Noticed by the MS linker when doing link-time code generation (!). In
all cases, a "return" after a call to a function that always throws an
exception. To avoid other compilers perhaps warning about missing
return of a value, put the "returns" inside ifdefs.

Change-Id: I83aa04cb5c3ff8413d3ed4dc85fb57f2a41fd589

diff --git a/connectivity/source/commontools/BlobHelper.cxx 
b/connectivity/source/commontools/BlobHelper.cxx
index 15b6363..5135072 100644
--- a/connectivity/source/commontools/BlobHelper.cxx
+++ b/connectivity/source/commontools/BlobHelper.cxx
@@ -49,13 +49,17 @@ BlobHelper::BlobHelper(const 
::com::sun::star::uno::Sequence< sal_Int8 >& _val)
 ::sal_Int64 SAL_CALL BlobHelper::position( const 
::com::sun::star::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 
/*start*/ ) throw (::com::sun::star::sdbc::SQLException, 
::com::sun::star::uno::RuntimeException)
 {
 ::dbtools::throwFeatureNotImplementedException( "XBlob::position", *this );
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
 return 0;
+#endif
 }
 // 
-
 ::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const 
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XBlob >& /*pattern*/, 
::sal_Int64 /*start*/ ) throw (::com::sun::star::sdbc::SQLException, 
::com::sun::star::uno::RuntimeException)
 {
 ::dbtools::throwFeatureNotImplementedException( "XBlob::positionOfBlob", 
*this );
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
 return 0;
+#endif
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx 
b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 32d1e18..7ebd380 100644
--- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -326,13 +326,17 @@ sal_Bool SAL_CALL 
ODatabaseMetaDataResultSet::isAfterLast(  ) throw(SQLException
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst(  ) throw(SQLException, 
RuntimeException)
 {
 ::dbtools::throwFunctionSequenceException(*this);
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
 return sal_False;
+#endif
 }
 // -
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast(  ) throw(SQLException, 
RuntimeException)
 {
 ::dbtools::throwFunctionSequenceException(*this);
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
 return sal_False;
+#endif
 }
 // -
 void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst(  ) throw(SQLException, 
RuntimeException)
@@ -360,32 +364,42 @@ void SAL_CALL ODatabaseMetaDataResultSet::close(  ) 
throw(SQLException, RuntimeE
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first(  ) throw(SQLException, 
RuntimeException)
 {
 ::dbtools::throwFunctionSequenceException(*this);
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
 return sal_False;
+#endif
 }
 // -
 
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last(  ) throw(SQLException, 
RuntimeException)
 {
 ::dbtools::throwFunctionSequenceException(*this);
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
 return sal_False;
+#endif
 }
 // -
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 /*row*/ ) 
throw(SQLException, RuntimeException)
 {
 ::dbtools::throwFunctionSequenceException(*this);
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
 return sal_False;
+#endif
 }
 // -
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 /*row*/ ) 
throw(SQLException, RuntimeException)
 {
 ::dbtools::throwFunctionSequenceException(*this);
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
 return sal_False;
+#endif
 }
 // -
 sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous(  ) throw(SQLException, 
RuntimeException)
 {
 ::dbtools::throwFunctionSequenceException(*this);
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
 return sal_False;
+#endif
 }
 

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

[Tor Lillqvist]

 xmlsecurity/source/framework/buffernode.cxx |   32 
 xmlsecurity/source/framework/buffernode.hxx |1 
 xmlsecurity/source/framework/saxeventkeeperimpl.cxx |7 
 3 files changed, 40 deletions(-)

New commits:
commit f1dd6b8d6221ef4da982cc9e10a761df52ab2310
Author: Tor Lillqvist 
Date:   Wed Sep 4 01:57:11 2013 +0300

WaE: 'BufferNode::notifyAncestor': recursive call has no side effects

Interesting function that just traverses a chain of objects using
recursion, but does nothing at all otherwise. Kill it. But at least it
had an Enterprise Ready block comment in front.

Change-Id: If2296d2534cb9451d4ceadaf966b8c70f0a17557

diff --git a/xmlsecurity/source/framework/buffernode.cxx 
b/xmlsecurity/source/framework/buffernode.cxx
index 64a5a51..bea9a958 100644
--- a/xmlsecurity/source/framework/buffernode.cxx
+++ b/xmlsecurity/source/framework/buffernode.cxx
@@ -788,38 +788,6 @@ void BufferNode::notifyBranch()
 }
 }
 
-void BufferNode::notifyAncestor()
-/** BufferNode/notifyAncestor 
- *
- *   NAME
- *  notifyAncestor -- notifies each ancestor BufferNode through the parent
- *  link.
- *
- *   SYNOPSIS
- *  notifyAncestor();
- *
- *   FUNCTION
- *  see NAME
- *
- *   INPUTS
- *  empty
- *
- *   RESULT
- *  empty
- *
- *   AUTHOR
- *  Michael Mi
- *  Email: michael...@sun.com
- 
**/
-{
-BufferNode* pParent = m_pParent;
-while (pParent != NULL)
-{
-pParent->notifyAncestor();
-pParent = (BufferNode*)pParent->getParent();
-}
-}
-
 void BufferNode::elementCollectorNotify()
 /** BufferNode/elementCollectorNotify 
  *
diff --git a/xmlsecurity/source/framework/buffernode.hxx 
b/xmlsecurity/source/framework/buffernode.hxx
index 8685d7f..a6468e4 100644
--- a/xmlsecurity/source/framework/buffernode.hxx
+++ b/xmlsecurity/source/framework/buffernode.hxx
@@ -113,7 +113,6 @@ public:
 void setXMLElement(const com::sun::star::uno::Reference<
 com::sun::star::xml::wrapper::XXMLElementWrapper >& xXMLElement);
 void notifyBranch();
-void notifyAncestor();
 void elementCollectorNotify();
 void freeAllChildren();
 };
diff --git a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx 
b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
index afe98c5..c79ee65 100644
--- a/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
+++ b/xmlsecurity/source/framework/saxeventkeeperimpl.cxx
@@ -722,8 +722,6 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
 ElementCollector* pElementCollector = 
(ElementCollector*)pElementMark;
 
 cssxc::sax::ElementMarkPriority nPriority = 
pElementCollector->getPriority();
-bool bToModify = pElementCollector->getModify();
-
 /*
  * Delete the EC from the buffer node.
  */
@@ -735,11 +733,6 @@ void SAXEventKeeperImpl::releaseElementMarkBuffer()
 pBufferNode->notifyBranch();
 }
 
-if (bToModify)
-{
-pBufferNode->notifyAncestor();
-}
-
 /*
  * delete the ElementMark
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 sw/CppunitTest_sw_odfimport.mk   |1 
 sw/qa/extras/odfimport/data/fdo68839.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx |   35 +++
 3 files changed, 36 insertions(+)

New commits:
commit 3c8bee809d248ef1fd39ebeae68de84ce70d358a
Author: Michael Stahl 
Date:   Wed Sep 4 00:16:48 2013 +0200

fdo#68839: add unit test

Change-Id: Ic47bfdeb1466a3772c95008dbf035f294cc3ece4

diff --git a/sw/CppunitTest_sw_odfimport.mk b/sw/CppunitTest_sw_odfimport.mk
index d302127..55805a8 100644
--- a/sw/CppunitTest_sw_odfimport.mk
+++ b/sw/CppunitTest_sw_odfimport.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_CppunitTest_use_components,sw_odfimport,\
basic/util/sb \
 comphelper/util/comphelp \
 configmgr/source/configmgr \
+   embeddedobj/util/embobj \
 fileaccess/source/fileacc \
 filter/source/config/cache/filterconfig1 \
 framework/util/fwk \
diff --git a/sw/qa/extras/odfimport/data/fdo68839.odt 
b/sw/qa/extras/odfimport/data/fdo68839.odt
new file mode 100644
index 000..92a25b8
Binary files /dev/null and b/sw/qa/extras/odfimport/data/fdo68839.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index d5e1c97..a773eb3 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -27,6 +27,7 @@ public:
 void testFdo60842();
 void testFdo56272();
 void testFdo55814();
+void testFdo68839();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -50,6 +51,7 @@ void Test::run()
 {"fdo60842.odt", &Test::testFdo60842},
 {"fdo56272.odt", &Test::testFdo56272},
 {"fdo55814.odt", &Test::testFdo55814},
+{"fdo68839.odt", &Test::testFdo68839},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -320,6 +322,39 @@ void Test::testFdo55814()
 CPPUNIT_ASSERT_EQUAL(OUString("Hide==\"Yes\""), 
getProperty(xSections->getByIndex(0), "Condition"));
 }
 
+void lcl_CheckShape(
+uno::Reference const& xShape, OUString const& rExpected)
+{
+uno::Reference const xNamed(xShape, uno::UNO_QUERY);
+CPPUNIT_ASSERT(xNamed.is());
+CPPUNIT_ASSERT_EQUAL(rExpected, xNamed->getName());
+}
+
+void Test::testFdo68839()
+{
+// check names
+lcl_CheckShape(getShape(1), "FrameXXX");
+lcl_CheckShape(getShape(2), "ObjectXXX");
+lcl_CheckShape(getShape(3), "FrameY");
+lcl_CheckShape(getShape(4), "graphicsXXX");
+try {
+uno::Reference xShape = getShape(5);
+CPPUNIT_ASSERT(!"IndexOutOfBoundsException expected");
+} catch (lang::IndexOutOfBoundsException const&) { }
+// check prev/next chain
+uno::Reference xFrame1(getShape(1), uno::UNO_QUERY);
+uno::Reference xFrame2(getShape(3), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(OUString(),
+getProperty(xFrame1, "ChainPrevName"));
+CPPUNIT_ASSERT_EQUAL(OUString("FrameY"),
+getProperty(xFrame1, "ChainNextName"));
+CPPUNIT_ASSERT_EQUAL(OUString("FrameXXX"),
+getProperty(xFrame2, "ChainPrevName"));
+CPPUNIT_ASSERT_EQUAL(OUString(),
+getProperty(xFrame2, "ChainNextName"));
+}
+
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 embedserv/source/inprocserv/dllentry.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a463f74ebf9a2d415f645d4d81377f0207216324
Author: Tor Lillqvist 
Date:   Wed Sep 4 00:40:46 2013 +0300

WaE: C4723: potential divide by 0

Fix crack that formats an int into eight hex digits. Why the simple
sprintf() that originally was used here was not good enough, but had
to be replaced (in 2009) by broken and hard to understand code I have
no idea.

Found during link-time code generation (!).

Change-Id: I05b33ca0fcb6a47a846ec2ff294243c5639a5b49

diff --git a/embedserv/source/inprocserv/dllentry.cxx 
b/embedserv/source/inprocserv/dllentry.cxx
index 3622c96..e642128 100644
--- a/embedserv/source/inprocserv/dllentry.cxx
+++ b/embedserv/source/inprocserv/dllentry.cxx
@@ -53,7 +53,7 @@ namespace {
 int nInd = 0;
 while( nInd < nLen )
 {
-char nSign = ( nValue / ( 1 << ( ( nLen - nInd ) * 4 ) ) ) % 16;
+char nSign = ( nValue / ( 1 << ( ( nLen - nInd - 1 ) * 4 ) ) ) % 
16;
 if ( nSign >= 0 && nSign <= 9 )
 pBuf[nInd] = nSign + '0';
 else if ( nSign >= 10 && nSign <= 15 )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 dtrans/source/win32/misc/ImplHelper.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit ba083e5c5a4723db90acacb769c4f1624f182287
Author: Tor Lillqvist 
Date:   Wed Sep 4 00:58:42 2013 +0300

WaE: use number() instead of valueOf()

Change-Id: I4a464a8e6448d1f9b1be820f11e643930682bcdb

diff --git a/dtrans/source/win32/misc/ImplHelper.cxx 
b/dtrans/source/win32/misc/ImplHelper.cxx
index 982d33f..3337644 100644
--- a/dtrans/source/win32/misc/ImplHelper.cxx
+++ b/dtrans/source/win32/misc/ImplHelper.cxx
@@ -94,11 +94,11 @@ OUString SAL_CALL getWinCPFromLocaleId( LCID lcid, LCTYPE 
lctype )
 // set an default value
 if ( LOCALE_IDEFAULTCODEPAGE == lctype )
 {
-winCP = OUString::valueOf( static_cast(GetOEMCP( )), 10 );
+winCP = OUString::number( static_cast(GetOEMCP( )) );
 }
 else if ( LOCALE_IDEFAULTANSICODEPAGE == lctype )
 {
-winCP = OUString::valueOf( static_cast(GetACP( )), 10 );
+winCP = OUString::number( static_cast(GetACP( )) );
 }
 else
 OSL_ASSERT( sal_False );
@@ -180,7 +180,7 @@ OUString SAL_CALL cptostr( sal_uInt32 codepage )
 {
 OSL_ASSERT( IsValidCodePage( codepage ) );
 
-return OUString::valueOf( static_cast( codepage ), 10 );
+return OUString::number( static_cast( codepage ) );
 }
 
 //-
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: is there a portable version of libre office for win 7 ?

[Pedro]

Hi Jonathan


Jonathan Aquilina wrote
> How is the portable apps one not as good as the other they should be
> exactly the same.

They are exactly the same package. But the winPenPack packaging has some
fantastic details (ability to choose more than one interface language and
more than one set of language tools). In addition the binaries are somehow
optimized. They just run faster (even faster than the installed official
version) and this is particularly noticeable on slower hardware.

Just try it for yourself.

In any case this is the Dev mailing list and the whole topic is completely
out of place (if this was a Forum it would already have been moved ;) )

Cheers,
Pedro



--
View this message in context: 
http://nabble.documentfoundation.org/is-there-a-portable-version-of-libre-office-for-win-7-tp4072807p4072877.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tor Lillqvist]

 solenv/gbuild/gbuild.mk |1 +
 ucbhelper/source/client/content.cxx |4 
 2 files changed, 5 insertions(+)

New commits:
commit 9c0ba0ba41cb3b814cc8bf7a33abf1245d4b241e
Author: Tor Lillqvist 
Date:   Tue Sep 3 23:51:32 2013 +0300

WaE: Unreachable code

This time noticed by the linker when doing link-time code generation (!).

Change-Id: I9600571bef2a8cc30b2e28dd52b01633bab55f32

diff --git a/ucbhelper/source/client/content.cxx 
b/ucbhelper/source/client/content.cxx
index aac47d4..850f56e 100644
--- a/ucbhelper/source/client/content.cxx
+++ b/ucbhelper/source/client/content.cxx
@@ -1049,9 +1049,11 @@ sal_Bool Content::isFolder()
 get() ) ),
  m_xImpl->getEnvironment() );
 
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
 // Unreachable - cancelCommandExecution always throws an exception.
 // But some compilers complain...
 return sal_False;
+#endif
 }
 
 //=
@@ -1070,9 +1072,11 @@ sal_Bool Content::isDocument()
 get() ) ),
  m_xImpl->getEnvironment() );
 
+#if !(defined(_MSC_VER) && defined(ENABLE_LTO))
 // Unreachable - cancelCommandExecution always throws an exception,
 // But some compilers complain...
 return sal_False;
+#endif
 }
 
 //=
commit 4775a2b0fb0f01caa1e56934ac26d898dcd0fb48
Author: Tor Lillqvist 
Date:   Tue Sep 3 23:50:03 2013 +0300

Make it possible to #ifdef on ENABLE_LTO

Change-Id: I849af224b6a34d1db21816cfe348d9319c2938ae

diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 1c5dcfa..9d5c1d7 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -259,6 +259,7 @@ gb_GLOBALDEFS += \
DISABLE_DYNLOADING \
DISABLE_EXPORT \
DISABLE_SCRIPTING \
+   ENABLE_LTO \
)
 
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 solenv/gbuild/platform/com_MSC_class.mk |9 +
 solenv/gbuild/platform/com_MSC_defs.mk  |2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 3105e301c4f6dc008f0532ba051ee158a28c58a7
Author: Tor Lillqvist 
Date:   Tue Sep 3 22:37:15 2013 +0300

Need the gb_LTOFLAGS (-GL) also when precompiling headers

Change-Id: I558c2b5429c3f6e361e0a8e44f32f7f2e74833a5

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index e68bac1..28c19460 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -104,6 +104,7 @@ $(call gb_Helper_abbreviate_dirs,\
unset INCLUDE && \
$(gb_CXX) \
$(4) $(5) -Fd$(PDBFILE) \
+   $(gb_LTOFLAGS) \
$(gb_COMPILERDEPFLAGS) \
-I$(dir $(3)) \
$(6) \
commit c4587bce6d4eeb4379f17760b31d79b9448198fa
Author: Tor Lillqvist 
Date:   Tue Sep 3 22:10:26 2013 +0300

Use -LTCG also when linking executables in the LTO case

Change-Id: I63113ed7e4a477d1ea7cd7f59a8647f4edf62d70

diff --git a/solenv/gbuild/platform/com_MSC_class.mk 
b/solenv/gbuild/platform/com_MSC_class.mk
index db288d9..e68bac1 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -216,6 +216,10 @@ gb_Windows_PE_TARGETTYPEFLAGS := \
-dynamicbase \
-manifest
 
+ifeq ($(ENABLE_LTO),TRUE)
+gb_Windows_PE_TARGETTYPEFLAGS += -LTCG
+endif
+
 # Library class
 
 
@@ -224,10 +228,6 @@ gb_Library_TARGETTYPEFLAGS := \
-DLL \
$(gb_Windows_PE_TARGETTYPEFLAGS)
 
-ifeq ($(ENABLE_LTO),TRUE)
-gb_Library_TARGETTYPEFLAGS += -LTCG
-endif
-
 gb_Library_get_rpath :=
 
 gb_Library_SYSPRE := i
commit 32d9dd3008867199f56ab1dbb192aa3f49a2779b
Author: Tor Lillqvist 
Date:   Tue Sep 3 22:09:45 2013 +0300

Just use simple -O2

Change-Id: Ibaa3f11651d15e9848ab25192bbd6718259cd162

diff --git a/solenv/gbuild/platform/com_MSC_defs.mk 
b/solenv/gbuild/platform/com_MSC_defs.mk
index 2cca886..aaf1a55 100644
--- a/solenv/gbuild/platform/com_MSC_defs.mk
+++ b/solenv/gbuild/platform/com_MSC_defs.mk
@@ -253,7 +253,7 @@ gb_CFLAGS+=$(gb_DEBUG_CFLAGS)
 gb_CXXFLAGS+=$(gb_DEBUG_CFLAGS)
 endif
 
-gb_COMPILEROPTFLAGS := -Ob1 -Oxs -Oy-
+gb_COMPILEROPTFLAGS := -O2
 gb_COMPILERNOOPTFLAGS := -Od
 
 ifeq ($(gb_FULLDEPS),$(true))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Michael Stahl]

 xmloff/inc/xmloff/xmlmultiimagehelper.hxx  |2 -
 xmloff/source/core/xmlmultiimagehelper.cxx |4 +--
 xmloff/source/draw/ximpshap.cxx|5 ++--
 xmloff/source/text/XMLTextFrameContext.cxx |   30 +++--
 4 files changed, 34 insertions(+), 7 deletions(-)

New commits:
commit 628ed5e89b6c92d41c4ba411ec53ff6bb0f3fbc8
Author: Michael Stahl 
Date:   Tue Sep 3 00:32:08 2013 +0200

fdo#68839: ODF import: fix name of multi-image frame

When multiple image child elements are inside a frame, each one is
imported and gets unique name via SwDoc::SetFlyName().  But the
retained one is not necessarily the first one, which is the only one
that may have the original name.

Also the solveMultipleImages needs to return a smart pointer, as nothing
else keeps the image contexts alive.

(regression from 44cfc7cb6533d827fd2d6e586d92c61d7d7f7a70)

(cherry picked from commit b69d152cfa1da868ba960345d72ba78f9f8e1b35)

Conflicts:
xmloff/source/core/xmlmultiimagehelper.cxx
xmloff/source/draw/ximpshap.cxx
xmloff/source/text/XMLTextFrameContext.cxx

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

diff --git a/xmloff/inc/xmloff/xmlmultiimagehelper.hxx 
b/xmloff/inc/xmloff/xmlmultiimagehelper.hxx
index bbe9ce1..5544806 100644
--- a/xmloff/inc/xmloff/xmlmultiimagehelper.hxx
+++ b/xmloff/inc/xmloff/xmlmultiimagehelper.hxx
@@ -44,7 +44,7 @@ public:
 /// see imlementation for evtl. changing weights and/or adding filetypes.
 ///
 /// @returns import context of the selected image
-const SvXMLImportContext* solveMultipleImages();
+SvXMLImportContextRef solveMultipleImages();
 
 /// add a content to the remembered image import contexts
 void addContent(const SvXMLImportContext& rSvXMLImportContext);
diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx 
b/xmloff/source/core/xmlmultiimagehelper.cxx
index 5b9b9f5..cd7 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -89,9 +89,9 @@ multiImageImportHelper::~multiImageImportHelper()
 }
 }
 
-const SvXMLImportContext* multiImageImportHelper::solveMultipleImages()
+SvXMLImportContextRef multiImageImportHelper::solveMultipleImages()
 {
-const SvXMLImportContext* pContext(0);
+SvXMLImportContextRef pContext;
 if(maImplContextVector.size() > 1)
 {
 // multiple child contexts were imported, decide which is the most 
valuable one
diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx
index d60b74d..545aa74 100644
--- a/xmloff/source/draw/ximpshap.cxx
+++ b/xmloff/source/draw/ximpshap.cxx
@@ -3534,8 +3534,9 @@ void SdXMLFrameShapeContext::StartElement(const 
uno::Reference< xml::sax::XAttri
 void SdXMLFrameShapeContext::EndElement()
 {
 // solve if multiple image child contexts were imported
-const SvXMLImportContext* const pSelectedContext(solveMultipleImages());
-const SdXMLGraphicObjectShapeContext* pShapeContext( dynamic_cast( pSelectedContext ) );
+SvXMLImportContextRef const pSelectedContext(solveMultipleImages());
+const SdXMLGraphicObjectShapeContext* pShapeContext(
+dynamic_cast(&pSelectedContext));
 if ( pShapeContext )
 {
 assert( mxImplContext.Is() );
diff --git a/xmloff/source/text/XMLTextFrameContext.cxx 
b/xmloff/source/text/XMLTextFrameContext.cxx
index 6e8fc2e2..1adb216 100644
--- a/xmloff/source/text/XMLTextFrameContext.cxx
+++ b/xmloff/source/text/XMLTextFrameContext.cxx
@@ -375,6 +375,7 @@ class XMLTextFrameContext_Impl : public SvXMLImportContext
 const ::rtl::OUString sTextBoxServiceName;
 const ::rtl::OUString sGraphicServiceName;
 
+::rtl::OUString m_sOrigName;
 ::rtl::OUString sName;
 ::rtl::OUString sStyleName;
 ::rtl::OUString sNextName;
@@ -452,6 +453,8 @@ public:
 
 void SetDesc( const ::rtl::OUString& rDesc );
 
+void SetName();
+
 ::com::sun::star::text::TextContentAnchorType GetAnchorType() const { 
return eAnchorType; }
 
 const ::com::sun::star::uno::Reference <
@@ -906,6 +909,7 @@ XMLTextFrameContext_Impl::XMLTextFrameContext_Impl(
 sStyleName = rValue;
 break;
 case XML_TOK_TEXT_FRAME_NAME:
+m_sOrigName = rValue;
 sName = rValue;
 break;
 case XML_TOK_TEXT_FRAME_FRAME_NAME:
@@ -1293,6 +1297,19 @@ void XMLTextFrameContext_Impl::SetHyperlink( const 
OUString& rHRef,
 }
 }
 
+void XMLTextFrameContext_Impl::SetName()
+{
+Reference xNamed(xPropSet, UNO_QUERY);
+if (xNamed.is())
+{
+OUString const name(xNamed->getName());
+if (name != m_sOrigName)
+{
+xNamed->setName(m_sOrigName);
+}
+}
+}
+
 // Implement Title/Description Elements UI (#i73249#)
 void XMLTextFrameCont

Re: 4.1 Wow!

[Norbert Thiebaud]

On Tue, Sep 3, 2013 at 2:45 PM, Luuk  wrote:
>
> what 'improvement' and 'little fixes' are you talking about?
>
> can you be more specific?

Let's just take it in the spirit in which it was given... if more
discussion is needed, let's take that to the user-list.

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

SOLVED: build warnings: ... unsigned only in ISO C90

[Terrence Enger]

> ...
> <
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=ea7ce8cf08521a7609d2ffc0969b1541fbbb9d0c
> >
> "Write integers as signed sal_Int32."

Thank you, Stephan.  The build is proceeding with those warnings.

Terry.




--
View this message in context: 
http://nabble.documentfoundation.org/subject-build-warnings-unsigned-only-in-ISO-C90-tp4072690p4072873.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Eike Rathke]

 i18nlangtag/source/isolang/isolang.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e87d0ae6359b63c2bb37e00944355ddd8d591496
Author: Eike Rathke 
Date:   Tue Sep 3 21:34:32 2013 +0200

'qtz' is a known no-country locale

Change-Id: I1045811f6c947282038fbec3c0d4b8c57b65635e

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 447a60a..68f5735 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -874,6 +874,7 @@ void MsLangId::Conversion::convertLanguageToLocaleImpl( 
LanguageType nLang,
 case LANGUAGE_USER_INTERLINGUA:
 case LANGUAGE_USER_LOJBAN:
 case LANGUAGE_KASHMIRI:
+case LANGUAGE_USER_KEYID:
 return pEntry->getLocale();
 default:
 ;   // nothing
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 avmedia/source/vlc/vlcplayer.cxx|   13 +
 avmedia/source/vlc/wrapper/Player.cxx   |   26 --
 avmedia/source/vlc/wrapper/Player.hxx   |2 +-
 avmedia/source/vlc/wrapper/SymbolLoader.hxx |4 ++--
 4 files changed, 24 insertions(+), 21 deletions(-)

New commits:
commit fd47df122a37b4fa982f9fd907d9aee0c80a
Author: Tor Lillqvist 
Date:   Tue Sep 3 23:05:05 2013 +0300

Fix typos and make the VLC code in theory work as 64-bit on Windows and OS X

It's MACOSX, not MACOS.

We can't cast a HWND or a pointer to an int and then back.

Have the UNX/MACOSX/WNT branches in the same order each time, at least
in Player.cxx.

Change-Id: I1a71efc2152970952cf2f12f719fd4c455f89dba

diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 060abcc..9c7d714 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -151,7 +151,7 @@ namespace
 {
 // TODO: Move this function to the common space for avoiding duplication 
with
 // gstreamer/gstwindow::createPlayerWindow functionality
-int GetWindowID( const uno::Sequence< uno::Any >& arguments )
+intptr_t GetWindowID( const uno::Sequence< uno::Any >& arguments )
 {
 if (arguments.getLength() <= 2)
 return -1;
@@ -168,14 +168,11 @@ namespace
 return -1;
 
 #if defined MACOSX
-// Explicit converts from NSView* to int
-const int id = reinterpret_cast( pEnvData->pView );
+const intptr_t id = reinterpret_cast( pEnvData->pView );
 #elif defined WNT
-// Explicit converts from HWND to int
-const int id = reinterpret_cast( pEnvData->hWnd );
+const intptr_t id = reinterpret_cast( pEnvData->hWnd );
 #else
-// Explicit converts from long to int
-const int id = static_cast( pEnvData->aWindow );
+const intptr_t id = static_cast( pEnvData->aWindow );
 #endif
 
 return id;
@@ -189,7 +186,7 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL 
VLCPlayer::createPlayerWind
 
 VLCWindow * const window = new VLCWindow;
 
-const int winID = GetWindowID( aArguments );
+const intptr_t winID = GetWindowID( aArguments );
 
 if ( winID != -1 )
 {
diff --git a/avmedia/source/vlc/wrapper/Player.cxx 
b/avmedia/source/vlc/wrapper/Player.cxx
index 763e5c9..973078a 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -42,10 +42,14 @@ namespace VLC
 int ( *libvlc_video_take_snapshot ) ( libvlc_media_player_t *p_mi, 
unsigned num,
 const char *psz_filepath, unsigned int i_width,
 unsigned int i_height );
-#if defined WNT
+#if defined UNX
+void ( *libvlc_media_player_set_xwindow ) ( libvlc_media_player_t 
*p_mi, uint32_t drawable );
+#elif defined MACOSX
+void ( *libvlc_media_player_set_nsobject ) ( libvlc_media_player_t 
*p_mi, void *drawable );
+#elif defined WNT
 void ( *libvlc_media_player_set_hwnd ) ( libvlc_media_player_t *p_mi, 
void *drawable );
 #else
-void ( *libvlc_media_player_set_xwindow ) ( libvlc_media_player_t 
*p_mi, uint32_t drawable );
+#error unknown OS
 #endif
 unsigned ( *libvlc_media_player_has_vout ) ( libvlc_media_player_t 
*p_mi );
 void ( *libvlc_video_set_mouse_input ) ( libvlc_media_player_t *p_mi, 
unsigned on);
@@ -70,10 +74,12 @@ namespace VLC
 SYM_MAP( libvlc_audio_set_mute ),
 SYM_MAP( libvlc_audio_get_mute ),
 SYM_MAP( libvlc_video_take_snapshot ),
-#if defined WNT
-SYM_MAP( libvlc_media_player_set_hwnd ),
-#else
+#if defined UNX
 SYM_MAP( libvlc_media_player_set_xwindow ),
+#elif defined MACOSX
+SYM_MAP( libvlc_media_player_set_nsobject ),
+#elif defined WNT
+SYM_MAP( libvlc_media_player_set_hwnd ),
 #endif
 SYM_MAP( libvlc_media_player_has_vout ),
 SYM_MAP( libvlc_video_set_mouse_input ),
@@ -173,13 +179,13 @@ namespace VLC
 }
 
 
-void Player::setWindow( int id )
+void Player::setWindow( intptr_t id )
 {
-#if defined( UNX )
-libvlc_media_player_set_xwindow( mPlayer, id );
-#elif defined( MACOS )
+#if defined UNX
+libvlc_media_player_set_xwindow( mPlayer, (uint32_t) id );
+#elif defined MACOSX
 libvlc_media_player_set_nsobject( mPlayer, reinterpret_cast( id 
) );
-#elif defined( WNT )
+#elif defined WNT
 libvlc_media_player_set_hwnd( mPlayer, reinterpret_cast( id ) );
 #endif
 }
diff --git a/avmedia/source/vlc/wrapper/Player.hxx 
b/avmedia/source/vlc/wrapper/Player.hxx
index 34886c9..68e4f44 100644
--- a/avmedia/source/vlc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/wrapper/Player.hxx
@@ -46,7 +46,7 @@ namespace VLC
 void setMute( bool mute);
 bool getMute() const;
 
-void setWindow( int id );
+void setWindow( intptr_

Re: 4.1 Wow!

[Luuk]

On 03-09-2013 20:03, Bruce Hohl wrote:

Hi All,
Please forgive me but I am going to misuse this list to say thanks for
version 4.1!
I use Calc almost everyday and I am very pleased with all the little
fixes and improvements.
This software is really reaching its potential under TDF and the LO
developers.
Thanks!





what 'improvement' and 'little fixes' are you talking about?

can you be more specific?

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

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

[Stephan Bergmann]

 avmedia/source/vlc/vlcplayer.cxx |7 +--
 avmedia/source/vlc/vlcwindow.cxx |3 +--
 avmedia/source/vlc/vlcwindow.hxx |4 +---
 3 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 99208858b934773d73fd0bd905c190a067c02947
Author: Stephan Bergmann 
Date:   Tue Sep 3 21:21:50 2013 +0200

Make --enable-vlc at least compile on Mac OS X

...no idea whether the change is actually any good, though.

Change-Id: Ib9e9bfbc894e9e0dde1f1a2e882bd09944f4d6d4

diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 15e1b1f..060abcc 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -167,7 +167,10 @@ namespace
 if (pEnvData == NULL)
 return -1;
 
-#if defined WNT
+#if defined MACOSX
+// Explicit converts from NSView* to int
+const int id = reinterpret_cast( pEnvData->pView );
+#elif defined WNT
 // Explicit converts from HWND to int
 const int id = reinterpret_cast( pEnvData->hWnd );
 #else
commit 728e2f41dbe5cf29fecfe4a96fbe3f6ce78517d8
Author: Stephan Bergmann 
Date:   Tue Sep 3 21:21:12 2013 +0200

-Werror,-Wunused-private-field

Change-Id: I18c800b581337ef0b6fc6cc862f60e69531e0336

diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 2671571..15e1b1f 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -184,7 +184,7 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL 
VLCPlayer::createPlayerWind
 {
 ::osl::MutexGuard aGuard(m_aMutex);
 
-VLCWindow * const window = new VLCWindow( *this );
+VLCWindow * const window = new VLCWindow;
 
 const int winID = GetWindowID( aArguments );
 
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index 9306392..b004875 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -9,8 +9,7 @@ namespace vlc {
 const ::rtl::OUString AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = 
"com.sun.star.comp.avmedia.Window_VLC";
 const ::rtl::OUString AVMEDIA_VLC_WINDOW_SERVICENAME = 
"com.sun.star.media.Window_VLC";
 
-VLCWindow::VLCWindow(VLCPlayer& player)
-: mPlayer( player )
+VLCWindow::VLCWindow()
 {
 }
 
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index 17a8c88..2aa3e47 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -23,14 +23,12 @@
 
 namespace avmedia {
 namespace vlc {
-class VLCPlayer;
 
 class VLCWindow : public ::cppu::WeakImplHelper2 < 
::com::sun::star::media::XPlayerWindow,

::com::sun::star::lang::XServiceInfo >
 {
-VLCPlayer& mPlayer;
 public:
-VLCWindow(VLCPlayer& player);
+VLCWindow();
 
 void SAL_CALL update() throw (css::uno::RuntimeException);
 ::sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw 
(css::uno::RuntimeException);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: 4.1 Wow!

[Luc Castermans]

Hi, I do not see too many of these mails. For sure appreciated by many/all!!

Luc


2013/9/3 Bruce Hohl 

> Hi All,
> Please forgive me but I am going to misuse this list to say thanks for
> version 4.1!
> I use Calc almost everyday and I am very pleased with all the little fixes
> and improvements.
> This software is really reaching its potential under TDF and the LO
> developers.
> Thanks!
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>


-- 
Luc Castermans
mailto:luc.casterm...@gmail.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 19 commits - cui/source desktop/source editeng/source framework/source i18nlangtag/source include/i18nlangtag lingucomponent/source linguistic/source svl/source sw/sour

[Eike Rathke]

 cui/source/options/optgdlg.cxx   |6 ++---
 desktop/source/app/langselect.cxx|2 -
 desktop/source/deployment/gui/dp_gui_service.cxx |2 -
 editeng/source/misc/unolingu.cxx |2 -
 framework/source/services/substitutepathvars.cxx |2 -
 i18nlangtag/source/languagetag/languagetag.cxx   |   14 
 include/i18nlangtag/languagetag.hxx  |   26 +++
 lingucomponent/source/lingutil/lingutil.cxx  |4 +--
 linguistic/source/convdicxml.cxx |2 -
 linguistic/source/dicimp.cxx |4 +--
 linguistic/source/gciterator.cxx |2 -
 linguistic/source/lngsvcmgr.cxx  |8 +++
 svl/source/config/languageoptions.cxx|2 -
 sw/source/filter/basflt/fltini.cxx   |2 -
 sw/source/filter/html/htmlcss1.cxx   |2 -
 sw/source/filter/html/htmlgrin.cxx   |2 -
 sw/source/filter/html/svxcss1.cxx|2 -
 unotools/source/config/lingucfg.cxx  |2 -
 unotools/source/config/syslocaleoptions.cxx  |2 -
 19 files changed, 64 insertions(+), 24 deletions(-)

New commits:
commit 68c3328e10258460992c49edf9563e879c1eb90c
Author: Eike Rathke 
Date:   Tue Sep 3 20:32:56 2013 +0200

was convertIsoStringToLanguage(), use convertToLanguageTypeWithFallback()

Change-Id: I6189cc5b45c085e3b8207980fb2931fab8fa3421

diff --git a/sw/source/filter/html/svxcss1.cxx 
b/sw/source/filter/html/svxcss1.cxx
index e04ccbd..4790c90 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -3089,7 +3089,7 @@ static void ParseCSS1_so_language( const CSS1Expression 
*pExpr,
 if( CSS1_IDENT == pExpr->GetType() ||
 CSS1_STRING == pExpr->GetType() )
 {
-LanguageType eLang = LanguageTag( pExpr->GetString() 
).getLanguageType();
+LanguageType eLang = LanguageTag::convertToLanguageTypeWithFallback( 
pExpr->GetString() );
 if( LANGUAGE_DONTKNOW != eLang )
 {
 SvxLanguageItem aLang( eLang, aItemIds.nLanguage );
commit 9817bd0faf74cb606b63a461b0e87aa401167c77
Author: Eike Rathke 
Date:   Tue Sep 3 20:28:44 2013 +0200

was convertIsoStringToLanguage(), use convertToLanguageTypeWithFallback()

Change-Id: Ib57abbb298160ce21fd584a5f3b88519e5422cfc

diff --git a/sw/source/filter/html/htmlgrin.cxx 
b/sw/source/filter/html/htmlgrin.cxx
index 2a125cb..58097a1 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -988,7 +988,7 @@ void SwHTMLParser::InsertBodyOptions()
 }
 if( aLang.Len() )
 {
-LanguageType eLang = LanguageTag::convertToLanguageType( aLang );
+LanguageType eLang = LanguageTag::convertToLanguageTypeWithFallback( 
aLang );
 if( LANGUAGE_DONTKNOW != eLang )
 {
 sal_uInt16 nWhich = 0;
commit fe8f47ce22130b23b7546bb741664e8fc5ffd58f
Author: Eike Rathke 
Date:   Tue Sep 3 20:26:07 2013 +0200

was convertIsoStringToLanguage(), use convertToLanguageTypeWithFallback()

Change-Id: I12cf6ad7ad658646dcee8cb54776e0915f1c8042

diff --git a/sw/source/filter/html/htmlcss1.cxx 
b/sw/source/filter/html/htmlcss1.cxx
index 8d31718..bfbcf0c 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -1934,7 +1934,7 @@ sal_Bool SwHTMLParser::ParseStyleOptions( const String 
&rStyle,
 
 if( pLang && pLang->Len() )
 {
-LanguageType eLang = LanguageTag::convertToLanguageType( *pLang );
+LanguageType eLang = LanguageTag::convertToLanguageTypeWithFallback( 
*pLang );
 if( LANGUAGE_DONTKNOW != eLang )
 {
 SvxLanguageItem aLang( eLang, RES_CHRATR_LANGUAGE );
commit a5fd27a77b39368c473757fc7b27a7a7fb2ca43c
Author: Eike Rathke 
Date:   Tue Sep 3 20:22:54 2013 +0200

was convertIsoStringToLanguage(), use convertToLanguageTypeWithFallback()

Change-Id: I123fe95ea4d772571001bc97133705d43a335465

diff --git a/sw/source/filter/basflt/fltini.cxx 
b/sw/source/filter/basflt/fltini.cxx
index b882d64..0729e3b 100644
--- a/sw/source/filter/basflt/fltini.cxx
+++ b/sw/source/filter/basflt/fltini.cxx
@@ -628,7 +628,7 @@ void SwAsciiOptions::ReadUserData( const OUString& rStr )
 sFont = sToken;
 break;
 case 3: // Language
-nLanguage = LanguageTag::convertToLanguageType( sToken );
+nLanguage = LanguageTag::convertToLanguageTypeWithFallback( 
sToken );
 break;
 }
 }
commit bdf442a86ad32cfd95352bf352080674c93b032a
Author: Eike Rathke 
Date:   Tue Sep 3 20:08:39 2013 +0200

was convertIsoStringToLanguage(), use convertToLanguageTypeWithFallback()

Change-Id: I4cfda0f08e1d85acc7f1b5819b8e0f64c4985bb1

diff --git a/unotools/source/config/syslocaleoptions.cxx 
b/unotools/source/config/syslocaleoption

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1-2' - configure.ac

[Christian Lohmaier]

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

New commits:
commit fbd79b1d476e76d7d2c8b3caf928ffa8ae940aa2
Author: Christian Lohmaier 
Date:   Tue Sep 3 21:08:39 2013 +0200

bump product version to 4.1.2.1.0+

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

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

[Andrzej J . R . Hunt]

 connectivity/source/drivers/firebird/DatabaseMetaData.cxx |6 
 connectivity/source/drivers/firebird/Driver.cxx   |9 -
 connectivity/source/drivers/firebird/ResultSet.cxx|  116 +++---
 3 files changed, 69 insertions(+), 62 deletions(-)

New commits:
commit 76e6c6f3ea2631b70368865b4d38803c9bc47fd6
Author: Andrzej J.R. Hunt 
Date:   Mon Sep 2 17:48:38 2013 +0100

Add some comments on foreign key retrieval (firebird-sdbc)

These two methods don't seem to be used at all within the LO codebase.
They are also extremely complicated to implement hence will be left for
later implementation -- my part implementation will be put on the wiki
firebird page.

Change-Id: I72922a4f3c4705fdcc3bbca140d6df64a1e16253

diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx 
b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
index ef817b7..2eabddf 100644
--- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
+++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx
@@ -1463,6 +1463,9 @@ uno::Reference< XResultSet > SAL_CALL 
ODatabaseMetaData::getVersionColumns(
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys(
 const Any& catalog, const OUString& schema, const OUString& table ) 
throw(SQLException, RuntimeException)
 {
+// List the columns in a table which are foreign keys. This is actually
+// never used anywhere in the LO codebase currently. Retrieval from 
firebird
+// requires using a 5-table join.
 SAL_WARN("connectivity.firebird", "Not yet implemented");
 (void) catalog;
 (void) schema;
@@ -1473,6 +1476,9 @@ uno::Reference< XResultSet > SAL_CALL 
ODatabaseMetaData::getExportedKeys(
 uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys(
 const Any& catalog, const OUString& schema, const OUString& table ) 
throw(SQLException, RuntimeException)
 {
+// List the columns in a table (which must be primary key, or possibly just
+// unique) that are referred to in other foreign keys. Will have a similar
+// 5-table or so join as in getExportedKeys.
 SAL_WARN("connectivity.firebird", "Not yet implemented");
 (void) catalog;
 (void) schema;
commit 868cd2461580d362c847846f6bb52a381b282b6f
Author: Andrzej J.R. Hunt 
Date:   Sun Sep 1 16:05:15 2013 +0100

Remove outdated/useless comments. (firebird-sdbc)

Change-Id: Iab163debab1513369b75183efdaa3c03f7193a70

diff --git a/connectivity/source/drivers/firebird/Driver.cxx 
b/connectivity/source/drivers/firebird/Driver.cxx
index 729dc2b..5e9f04b 100644
--- a/connectivity/source/drivers/firebird/Driver.cxx
+++ b/connectivity/source/drivers/firebird/Driver.cxx
@@ -76,7 +76,6 @@ void FirebirdDriver::disposing()
 {
 MutexGuard aGuard(m_aMutex);
 
-// when driver will be destroied so all our connections have to be 
destroied as well
 for (OWeakRefArray::iterator i = m_xConnections.begin(); 
m_xConnections.end() != i; ++i)
 {
 Reference< XComponent > xComp(i->get(), UNO_QUERY);
@@ -99,7 +98,6 @@ rtl::OUString FirebirdDriver::getImplementationName_Static() 
throw(RuntimeExcept
 
 Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() throw 
(RuntimeException)
 {
-// TODO: add com.sun.star.sdbcx.Driver once all sdbc functionality is 
implemented
 Sequence< OUString > aSNS( 2 );
 aSNS[0] = OUString("com.sun.star.sdbc.Driver");
 aSNS[0] = OUString("com.sun.star.sdbcx.Driver");
@@ -143,12 +141,11 @@ Reference< XConnection > SAL_CALL FirebirdDriver::connect(
throw DisposedException();
 
 if ( ! acceptsURL(url) )
-return NULL; // TODO: throw Exception?
+return NULL;
 
-// create a new connection with the given properties and append it to our 
vector
 OConnection* pCon = new OConnection(this);
-Reference< XConnection > xCon = pCon;   // important here because 
otherwise the connection could be deleted inside (refcount goes -> 0)
-pCon->construct(url,info); // late constructor call which can throw 
exception and allows a correct dtor call when so
+Reference< XConnection > xCon = pCon;
+pCon->construct(url, info);
 m_xConnections.push_back(WeakReferenceHelper(*pCon));
 
 return xCon;
commit 3a5fa58344399f9de5d20fe0b1ed82b074fb5eba
Author: Andrzej J.R. Hunt 
Date:   Fri Aug 30 17:12:58 2013 +0100

ResultSet: add FunctionNotSupportedException, some cleanup. (firebird-sdbc)

Change-Id: Iee897766841af980d93aeb73255c82851172601a

diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx 
b/connectivity/source/drivers/firebird/ResultSet.cxx
index aec90bf..6946100 100644
--- a/connectivity/source/drivers/firebird/ResultSet.cxx
+++ b/connectivity/source/drivers/firebird/ResultSet.cxx
@@ -136,7 +136,6 @@ sal_Bool SAL_CALL OResultSet::next() throw(SQLException, 
RuntimeException)
 }
 else if (fetchStat == 100L) // END OF DATASET
 {
-// TODO: shut the 

[Libreoffice-commits] core.git: 2 commits - filter/source sal/osl scp2/source

[Jesús Corrius]

 filter/source/graphicfilter/ieps/ieps.cxx  |2 +-
 sal/osl/w32/nlsupport.c|2 +-
 scp2/source/winexplorerext/registryitem_winexplorerext.scp |8 
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 9de95a52405c948a32895aec1da06c9d33b4eee2
Author: Jesús Corrius 
Date:   Tue Sep 3 21:07:25 2013 +0200

ICE03: WARNING: String overflow (greater than length permitted in column)

Change-Id: I3c918da4c093489db122bc5af7401c7c93c1579e

diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp 
b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index d34223c..a8eda1d 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -128,14 +128,14 @@ End
 
 // Begin registry items for the Column handler
 
-RegistryItem 
gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396
+RegistryItem 
gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 ModuleID = gid_Module_Optional_Winexplorerext;
 Subkey = 
"Folder\shellex\ColumnHandlers\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}";
 Value = "%PRODUCTNAME Column Handler";
 End
 
-RegistryItem 
gid_Regitem_Folder_shellex_ColumnHandlers_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_x64
+RegistryItem 
gid_Regitem_Folder_shellex_ColHandl_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_x64
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 ModuleID = gid_Module_Optional_Winexplorerext_x64;
 ComponentCondition = "VersionNT64";
@@ -259,14 +259,14 @@ RegistryItem 
gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_x64
 Value = "OpenDocument Format Persistent Handler";
 End
 
-RegistryItem 
gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered
+RegistryItem 
gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsReg
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 ModuleID = gid_Module_Optional_Winexplorerext;
 Subkey = 
"CLSID\{7BC0E713-5703-45BE-A29D-5D46D8B39262}\PersistentAddinsRegistered\{89BCB740-6119-101A-BCB7-00DD010655AF}";
 Value = "{7BC0E710-5703-45BE-A29D-5D46D8B39262}";
 End
 
-RegistryItem 
gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsRegistered_x64
+RegistryItem 
gid_Regitem_Clsid_7BC0E713_5703_45BE_A29D_5D46D8B39262_PersistentAddinsReg_x64
 ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
 ModuleID = gid_Module_Optional_Winexplorerext_x64;
 ComponentCondition = "VersionNT64";
commit 6f667f7e5ba1033d4abedf9efca6607b449c2396
Author: Jesús Corrius 
Date:   Tue Sep 3 20:44:16 2013 +0200

dezimal -> decimal

Change-Id: I196026cc7f2f885664e9719557f662a32a7187b8

diff --git a/filter/source/graphicfilter/ieps/ieps.cxx 
b/filter/source/graphicfilter/ieps/ieps.cxx
index de06d5d..311bf8c 100644
--- a/filter/source/graphicfilter/ieps/ieps.cxx
+++ b/filter/source/graphicfilter/ieps/ieps.cxx
@@ -598,7 +598,7 @@ GraphicImport(SvStream & rStream, Graphic & rGraphic, 
FilterConfigItem*, sal_Boo
 {
 if ( nByte > '9' )
 {
-nByte &=~0x20; 
 // case none sensitive for hexadezimal values
+nByte &=~0x20; 
 // case none sensitive for hexadecimal values
 nByte -= ( 'A' 
- 10 );
 if ( nByte > 
15 )
 bIsValid = 
sal_False;
diff --git a/sal/osl/w32/nlsupport.c b/sal/osl/w32/nlsupport.c
index 04c63aa..175a8c6 100644
--- a/sal/osl/w32/nlsupport.c
+++ b/sal/osl/w32/nlsupport.c
@@ -147,7 +147,7 @@ rtl_TextEncoding GetTextEncodingFromLCID( LCID localeId )
 WCHAR *pwcEnd;
 UINT  codepage;
 
-/* values returned from GetLocaleInfo are dezimal based */
+/* values returned from GetLocaleInfo are decimal based */
 codepage = wcstol( ansiCP, &pwcEnd, 10 );
 
 /* find matching rtl encoding */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

iveand  changed:

   What|Removed |Added

 Depends on||68313

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.1.2.1' created by Christian Lohmaier 
 at 2013-09-03 20:04 -0700

Tag libreoffice-4.1.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJSJjKvAAoJEPQ0oe+v7q6jmiUP/0r5xVilIXphnNauYLKSkqQz
t3yXYWjWBC52p8LYz9YPEimnLR7BxfYbyI/TsYJvVIy4R2JX3C72Ur8b3mZKAsrA
yhYEhBmXF/T2GJfpCW9mYIBbb3yE5GCFOYIhr9gdK+lNneWbulTLiAKn7DxmzmbR
zZQcrOabVgZgTtYWUJd8h6nAulfvo2txCdtO/ah2hc6dt+RDxAsoeKW45YTsAZdo
RTvEaiehedXTRyc+o8foK+GnrDTETCgkPqwzUspfyq/ScqC7z35Hh07qGiAw+o7R
curEH2tG/FTX1CcLBWus9qssMZ6l9fdZ3+mYtcp/jqyQVkef96/W09sosKovCwRb
57JPUrcxj1bKWXdl+xWYnbhYzbuRl9JikW2boXDjnt6dprEaUMcMl8B5MUz4XIma
QZa5Ht5SpmAFrnNjccj05CbjBsEoks0iME9Bh9fJNt/XPTDKKDn49SnLQD77pkgz
jCfg6KrdjX5TsgdU3+bS4WkntD48MqadVHsEqw92ynsjhO2aYp3aZ4fijzs+u9Z4
9w/r+4tHuGjbxC6lAnBPBb9DeLFJ35GVXyRhIu6GH6pQFk/9GI7YoV3gvW/L8h7q
K1nTQsug0OyFlQ0C3LpJfkaASm2gP2OQKElXl6EIZBhFudKnzZSm3eW8ei9u4DQj
oSZuprhUqxBylK+OKSOS
=LWs7
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.1.2.1' created by Christian Lohmaier 
 at 2013-09-03 20:04 -0700

Tag libreoffice-4.1.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJSJjKpAAoJEPQ0oe+v7q6jWP0P/3cNX61kJTAkwoNfGc0/bWkA
1UPjKj6X0Y/6kWYUuQSgKfkrf68RIHHHbIEsf8i8TmgNIRGkDAGJreA611gywI0O
kYLGwZF95Kk47yL86fP+KBVauFBf7YVTzR//bwz3A4xpk5NL4ALeG0Tm89ZDN9Dj
l4eD63a/J50cUadTbO4VT2m6CbCquY3/agDUeeI/JZkYPZBD4WZe8I0PTaNKOGR4
RAaWF1REguu4u4tqZXvifmHAyefhHfo/TFnChHGDF6fCEsWXU/Z/9hoetqSUHR+W
ZboL78BizP9WsYfPga1fSmyO6m5UkS869fTkV6N6Wgc4XC7cqpNT+NK2Xp0D2hT5
C2GjWK5vy5BGKe0LtaM3/SP4fcg/4YU9qr8/x2g0eg7Gk67NJSD0OxqV/sXp7svV
AcoDQpbZtg30QJ/pSz1BLFYJcBgTlX4834ooNHhxSGQI1baapip/I1ryny9o2SVY
L//jXEBi//gTx13l2uNv5K4MjUE10J2wwvC4U3dS72i2ER2Ba4G572REIwqxmgNt
oL18iqpQO/lyTABBVIIQRgnGmgb+tuAtq2CLy7ofMrUEaKjSVnxsynw4nR+b/ENI
IbDJl9x4Q27MNwnrL9OpEC5R3Ig7jLd7hIUCQqTdlzs8SnYEweQ6pGhvcU9pcE4B
og4n0HV/JaAiCu6VPhUp
=rVRF
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.1.2.1' created by Christian Lohmaier 
 at 2013-09-03 20:04 -0700

Tag libreoffice-4.1.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJSJjKkAAoJEPQ0oe+v7q6jfcsP/2FbsX1DrE+LtgM8QMGb8s+w
VxPMLc0TOTXJpRq/+TZviM2MxY23r1yj2jVxuNdgSBTGD0rMawzYzilBa2GtkafG
HAyI9OxqyFFTVfiswa7y5yz6drTJin5QgcrwrTRsie2wZeerS7fuT3y7oHdeJNJ/
4AU4o2ZUc2dk5O1cLsA8LLyPVX+DFuETUWdhi9XJGZISpKYJckXGiQRqqaRbcnNc
pP5UdVzaVRnCTojS4hCIdFapov0lR0XNyGtnugB5pDSXv3TkV+6B3pLwtQBHyjaT
GiUgZS9fVAm7JPtbOUzH1A1H4v5qhAbx2SkeKiWGTyvMi3b/vzr5KSR5/tQMSUgT
6cUB1Bd9BRUfJ4JxWSvjW/T2geKO0/4vsg9zh4V73s8NuHv8z6911RgCGLdLFf+C
UIkhIHssTrCkuUEsG/3TwYg0/YMhc+C9gE560QdY9lN5ZgDAA9W6M3Cu+z8ez4Iq
eB2z1ROHs+Pf70xlRBb7T7+od3Tj8m0yYU+uhwFOEt3QOosLuFIXGPgAjfCEIhaX
SrjQhU+96jzJLSQpAaWUwY0vC9B0R40WH40wYgKWUSm6W7FEqNULYOxCvsy7yJzR
w3YAVwU1cOsPIGIRf3ajjWF+9+B46jDhklDxNNI3C2D207jChKl2oB+6rnQbYpEa
8Sf0XD6Et/MygzAuQEMW
=04L8
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-4.1.2.1' created by Christian Lohmaier 
 at 2013-09-03 20:03 -0700

Tag libreoffice-4.1.2.1
-BEGIN PGP SIGNATURE-
Version: GnuPG v1.4.14 (GNU/Linux)

iQIcBAABAgAGBQJSJjKbAAoJEPQ0oe+v7q6jrRsP/1xg6hxv0fap/pnc1RcxR4Yg
Lufe/OoUMiWCLW3tN2E33k9nx2RHLMgA32HfYPCq1iEbsKkGHRCEOpJoaZJLnUZa
uafLPYaeaQ7/fqLTiaVHhY+yb3Y0qMidcmEskye9DhO+nwrkEodJxRvV9rCoV06s
sAO20r12w1X1M9HaV4xpNsdyn/WcRjnoNLBabVCFY2krbrF5SusEIIJPKeva7kn7
FU+d7/fSABD4C3IdcyOb2mDhmuRAhVbwPKDOgGPojwJ4Q6t9XTfvnGPXBGdWobxs
0F7qc94I10moGnPBdqCCRljBrxg7u+HaP4DEaiCjTGW49gFEXpgR58bNrSlpy7D9
4MrmIP4YgIcsMonUO/xzOzxeHSE83m8CsV62i8SCK6qdnUTS13fui+6X+KPZRrov
zrKr6t9zD0jVJcS4XTjJpeZmD4zKggjYhRmCJbMroiCpjSfYZze9t+xUbpyxVNmQ
ktWihDAeoQPUaO5Q1xtda8CeQyYEDN5Aq3sRX9YVQ7HIDYy6AkQt/s8yQBB7PLP4
Y6PvlFgOI0VSAwTgU5BH/Vgm58SHmgoFKSt8e7ZPQS5Hrir6BeYeVKGrUZYIG+6s
gSPzfukIycl/KVF/AW+PWC/gzsMlqkWkC9w5m5ee3HIaAm7Lhbiq2lsCxSqScx7n
HwvGsJz9UXVjXa5S1cHA
=WgIc
-END PGP SIGNATURE-

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

[Libreoffice-commits] core.git: openssl/ExternalProject_openssl.mk

[Tor Lillqvist]

 openssl/ExternalProject_openssl.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 54885512f2dc18d0095c6002d27bb2f7195b797a
Author: Tor Lillqvist 
Date:   Tue Sep 3 21:48:33 2013 +0300

Pass no-dso to the OpenSSL configury

No idea why OpenSSL would need to load dynamic libraries. Avoid linking 
error
on Linux when linking OpenSSL-using stuff (at least libpostgresql-sdbc-impl)
as we don't use -ldl when linking it. Sure, we could instead add -ldl to the
libraries used by libpostgresql-sdbc-impl I guess, but let's see first if 
this
works.

Change-Id: Ia4e5c6b8b08c127f378e1578de93c1fd5b213016

diff --git a/openssl/ExternalProject_openssl.mk 
b/openssl/ExternalProject_openssl.mk
index 35db867..e50dee9 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -77,6 +77,7 @@ $(call gb_ExternalProject_get_state_target,openssl,build):
&& $(if $(filter LINUX MACOSX FREEBSD ANDROID SOLARIS 
IOS,$(OS)),./Configure,\
$(if $(filter WNT,$(OS)),$(PERL) Configure,./config)) \
$(OPENSSL_PLATFORM) \
+   no-dso \
$(if $(filter ANDROID,$(OS)),\
shared no-idea,\
$(if $(filter IOS,$(OS)),no-shared no-idea,\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - cui/source filter/source include/sfx2 include/vcl padmin/source vcl/source

[Caolán McNamara]

 cui/source/dialogs/scriptdlg.cxx |1 -
 filter/source/xsltdialog/xmlfiltertestdialog.cxx |1 -
 include/sfx2/passwd.hxx  |2 +-
 include/vcl/dialog.hxx   |3 +++
 padmin/source/prtsetup.cxx   |2 --
 vcl/source/window/builder.cxx|5 +++--
 vcl/source/window/dialog.cxx |   12 
 7 files changed, 19 insertions(+), 7 deletions(-)

New commits:
commit a8af548c3be5a42cec7177c60c6d421d2dbc35b4
Author: Caolán McNamara 
Date:   Fri Jun 28 10:39:39 2013 +0100

always call setDeferredProperties for dialog get/set title

so we always get the correct up to date title even if we have
been holding off on setting some properties to ensure that
virtual method aren't called during construction

e.g. insert/edit index marks is always "Insert Index Mark"

(cherry picked from commit 31fc0b74425253589b2ac0dcecb9e8a2714954b4)

Change-Id: I57f9cc8fbdb9d2a304c346e03893fa55d6a61bd5
Reviewed-on: https://gerrit.libreoffice.org/5762
Reviewed-by: Fridrich Strba 
Tested-by: Fridrich Strba 

diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index e353412..672ff5e 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -508,7 +508,6 @@ SvxScriptOrgDialog::SvxScriptOrgDialog( Window* pParent, 
OUString language )
 get(m_pDelButton, "delete");
 // must be a neater way to deal with the strings than as above
 // append the language to the dialog title
-setDeferredProperties();
 String winTitle( GetText() );
 winTitle.SearchAndReplace( OUString( "%MACROLANG" ), m_sLanguage );
 SetText( winTitle );
diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.cxx 
b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
index 86894a7..099aec7 100644
--- a/filter/source/xsltdialog/xmlfiltertestdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltertestdialog.cxx
@@ -162,7 +162,6 @@ XMLFilterTestDialog::XMLFilterTestDialog(Window* pParent,
 m_pPBRecentFile->SetClickHdl(LINK( this, XMLFilterTestDialog, 
ClickHdl_Impl ) );
 m_pPBClose->SetClickHdl(LINK( this, XMLFilterTestDialog, ClickHdl_Impl ) );
 
-setDeferredProperties();
 m_sDialogTitle = GetText();
 
 try
diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index 1f10c74..b0efa7b 100644
--- a/include/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.hxx
@@ -73,7 +73,7 @@ private:
 voidSetPasswdText();
 
 public:
-SfxPasswordDialog(Window* pParent, const String* pGroupText = NULL);
+SfxPasswordDialog(Window* pParent, const OUString* pGroupText = NULL);
 
 String GetUser() const
 {
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index a8737d1..4e20d63 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -114,6 +114,9 @@ public:
 virtual short   Execute();
 sal_BoolIsInExecute() const { return mbInExecute; }
 
+virtual void  SetText( const OUString& rStr );
+virtual OUString  GetText() const;
+
 
 // Dialog::Execute replacement API
 public:
diff --git a/padmin/source/prtsetup.cxx b/padmin/source/prtsetup.cxx
index f3f42a1..5ee4958 100644
--- a/padmin/source/prtsetup.cxx
+++ b/padmin/source/prtsetup.cxx
@@ -91,8 +91,6 @@ RTSDialog::RTSDialog( const PrinterInfo& rJobData, const 
String& rPrinter, bool
 get(m_pCancelButton, "cancel");
 get(m_pTabControl, "notebook");
 
-setDeferredProperties();
-
 OUString aTitle(GetText());
 SetText(aTitle.replaceAll("%s", m_aJobData.m_aPrinterName));
 
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index fb29a2e..cd6e966 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1339,9 +1339,10 @@ void VclBuilder::setDeferredProperties()
 {
 if (!m_bToplevelHasDeferredProperties)
 return;
-set_properties(m_pParent, m_aDeferredProperties);
-m_aDeferredProperties.clear();
+stringmap aDeferredProperties;
+aDeferredProperties.swap(m_aDeferredProperties);
 m_bToplevelHasDeferredProperties = false;
+set_properties(m_pParent, aDeferredProperties);
 }
 
 void VclBuilder::set_properties(Window *pWindow, const stringmap &rProps)
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index b0bc71b..2a341c5 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1270,6 +1270,18 @@ bool Dialog::set_property(const OString &rKey, const 
OString &rValue)
 return true;
 }
 
+void Dialog::SetText(const OUString& rStr)
+{
+setDeferredProperties();
+SystemWindow::SetText(rStr);
+}
+
+OUString Dialog::GetText() const
+{
+const_cast(this)->setDeferredProperties();
+return SystemWindow::GetText();
+}
+
 VclBuilderContainer::VclBuilderContainer()
 : m_pUIBuilder(NULL)
 {
_

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

[Miklos Vajna]

 sw/qa/extras/ww8import/ww8import.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 60a3f35e63c360fb1b714d4bde60106775d202d9
Author: Miklos Vajna 
Date:   Tue Sep 3 20:57:32 2013 +0200

typo

Change-Id: Icea791684399fb15b5f7940b5691cdc76b3dde1f

diff --git a/sw/qa/extras/ww8import/ww8import.cxx 
b/sw/qa/extras/ww8import/ww8import.cxx
index 0199328..c61c9ed 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -255,7 +255,7 @@ void Test::testI120158()
 
 void Test::testN816603()
 {
-// Bugdoc was 5 page in Word, 1 in Writer due to pointlessly wrapping the
+// Bugdoc was 5 pages in Word, 1 in Writer due to pointlessly wrapping the
 // table in a frame. Exact layout may depend on fonts available, etc. --
 // but at least make sure that our table spans over multiple pages now.
 CPPUNIT_ASSERT(getPages() > 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

--- Comment #170 from iveand  ---
I am nominating Bug 68313

This is a major blocker that will not allow users with languages with multiple
diacritics on characters to be able to use Libre Office.

In short, these characters will disappear when preceding characters in the same
word are formatted (bolded, background color changed, etc.).  Some good test
cases are on the original bug list.

Regression from 3.6.x as the problem did not exist there.  Same problem in
Windows and Linux.

Update, I have just seen it started *after* 4.0.0.3 (a colleague was able to
confirm that Windows 4.0.0.3 does *not* have this problem)

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

Re: is there a portable version of libre office for win 7 ?

[Jonathan Aquilina]

How is the portable apps one not as good as the other they should be
exactly the same.


On Tue, Sep 3, 2013 at 6:09 PM, Tommy  wrote:

> On Tue, 03 Sep 2013 15:11:29 +0200, Pedro  wrote:
>
>  Actually there are two portable versions.
>>
>> The one suggested by Christian and X-LibreOffice from winPenPack.
>>
>> You can get the latest version from
>> http://www.winpenpack.com/en/**download.php?view.1354
>> or choose any specific version from
>> http://sourceforge.net/**projects/winpenpack/files/X-**
>> LibreOffice/releases/
>>
>> Hope this helps!
>>
>>
> I tried both version and I can tell that IMHO the winPenPack portable
> version is better that the one from PortableApps.
>
> __**_
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.**org 
> http://lists.freedesktop.org/**mailman/listinfo/libreoffice
>



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

[Libreoffice-commits] core.git: Branch 'distro/suse/suse-4.0' - instsetoo_native/util solenv/inc

[Andras Timar]

 instsetoo_native/util/openoffice.lst |   24 
 solenv/inc/minor.mk  |4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

New commits:
commit b6d84e347eb5a7e036fca6993f18bdfe3dd793ac
Author: Andras Timar 
Date:   Tue Sep 3 10:59:08 2013 -0700

Bump for 4.0-13

Change-Id: I9dfce7d5ece26409172d6e2e8cdd8aaa966e637a

diff --git a/instsetoo_native/util/openoffice.lst 
b/instsetoo_native/util/openoffice.lst
index ad08254..45fa506 100644
--- a/instsetoo_native/util/openoffice.lst
+++ b/instsetoo_native/util/openoffice.lst
@@ -33,7 +33,7 @@ Globals
 CREATE_MSP_INSTALLSET 1
 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt
 PACKAGEMAP package_names.txt,package_names_ext.txt
-WINDOWSPATCHLEVEL 12
+WINDOWSPATCHLEVEL 13
 OOOVENDOR The Document Foundation
 OOODOWNLOADNAME 1
 BUILDIDCWS {buildidcws}
@@ -50,13 +50,13 @@ LibreOffice
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -12
+PRODUCTEXTENSION -13
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-312
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-313
 BASEPRODUCTVERSION 4.0
 PCPFILENAME libreoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
@@ -100,14 +100,14 @@ LibreOffice_Dev
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -12
+PRODUCTEXTENSION -13
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-312
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-313
 BASEPRODUCTVERSION 4.0
 DEVELOPMENTPRODUCT 1
 BASISPACKAGEPREFIX lodevbasis
@@ -161,7 +161,7 @@ URE
 PRODUCTVERSION 4.0
 PACKAGEVERSION 4.0
 PACKAGEREVISION 1
-PRODUCTEXTENSION -12
+PRODUCTEXTENSION -13
 BRANDPACKAGEVERSION 4.0
 LICENSENAME LGPL
 NOVERSIONINDIRNAME 1
@@ -192,7 +192,7 @@ LibreOffice_SDK
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -12
+PRODUCTEXTENSION -13
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
 BRANDPACKAGEVERSION 4.0
@@ -231,7 +231,7 @@ LibreOffice_Dev_SDK
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -12
+PRODUCTEXTENSION -13
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION SDK
 POSTVERSIONEXTENSIONUNIX sdk
@@ -276,7 +276,7 @@ LibreOffice_Test
 {
 PRODUCTNAME LibreOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -12
+PRODUCTEXTENSION -13
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
 BRANDPACKAGEVERSION 4.0
@@ -315,7 +315,7 @@ LibreOffice_Dev_Test
 {
 PRODUCTNAME LOdev
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -12
+PRODUCTEXTENSION -13
 UNIXBASISROOTNAME lodev4.0
 POSTVERSIONEXTENSION TEST
 POSTVERSIONEXTENSIONUNIX test
@@ -359,13 +359,13 @@ OxygenOffice
 {
 PRODUCTNAME OxygenOffice
 PRODUCTVERSION 4.0
-PRODUCTEXTENSION -12
+PRODUCTEXTENSION -13
 POSTVERSIONEXTENSION
 POSTVERSIONEXTENSIONUNIX
 BRANDPACKAGEVERSION 4.0
 USERDIRPRODUCTVERSION 4
 ABOUTBOXPRODUCTVERSION 4.0
-ABOUTBOXPRODUCTVERSIONSUFFIX :build-312
+ABOUTBOXPRODUCTVERSIONSUFFIX :build-313
 BASEPRODUCTVERSION 4.0
 PCPFILENAME openoffice.pcp
 UPDATEURL http://update.libreoffice.org/check.php
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index 42c8395..d2e599c 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,6 +1,6 @@
 RSCVERSION=400
-RSCREVISION=400m1(Build:312)
-BUILD=312
+RSCREVISION=400m1(Build:313)
+BUILD=313
 LAST_MINOR=m0
 SOURCEVERSION=OOO400
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

4.1 Wow!

[Bruce Hohl]

Hi All,
Please forgive me but I am going to misuse this list to say thanks for
version 4.1!
I use Calc almost everyday and I am very pleased with all the little fixes
and improvements.
This software is really reaching its potential under TDF and the LO
developers.
Thanks!
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Tor Lillqvist]

 sw/source/filter/ww8/ww8par5.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 12e646839d9668dbffaad94074d8a75cde7ac0f5
Author: Tor Lillqvist 
Date:   Tue Sep 3 18:48:59 2013 +0300

OUString::replaceAll() is not in-place

Change-Id: I92c639b8b391dd07c07835241f8530e71ef6e885

diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 8734aee..0c3a0c9 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -1097,7 +1097,7 @@ long SwWW8ImplReader::Read_Field(WW8PLCFManResult* pRes)
 // Thus, delete character 0x01, which stands for such a graphic.
 if (aF.nId==51) //#i56768# only do it for the MACROBUTTON field, since 
DropListFields need the 0x01.
 {
-aStr.replaceAll(OUString(0x01), "");
+aStr = aStr.replaceAll(OUString(0x01), "");
 }
 
 eF_ResT eRes = (this->*aWW8FieldTab[aF.nId])( &aF, aStr );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: openssl/ExternalProject_openssl.mk

[Tor Lillqvist]

 openssl/ExternalProject_openssl.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4b2c4191cdb489055197355d93690caa9a220ef5
Author: Tor Lillqvist 
Date:   Tue Sep 3 19:35:07 2013 +0300

For some reason the asm code for rc4_md5_enc seems to go missing for x64 
Linux

So configure OpenSSL with the no-asm switch in that case.

Change-Id: I3ac291a5ca7681c14c269682deaf82798d76f522

diff --git a/openssl/ExternalProject_openssl.mk 
b/openssl/ExternalProject_openssl.mk
index ed99fe5..35db867 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -26,7 +26,7 @@ OPENSSL_PLATFORM := \
 $(if $(filter GNU/kFreeBSD,$(shell uname)),\
   debian-kfreebsd-amd64\
 ,\
-  $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64, 
linux-generic64)\
+  $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic64, 
linux-generic64) no-asm\
 )\
   ,\
 $(if $(filter TRUE, $(ENABLE_DBGUTIL)), debug-linux-generic32, 
linux-generic32)\
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Este fin de semana ven al Homenaje a la Tierra

[Ciencia y Espíritu]

Este fin de semana ven al Homenaje a la Tierra

El próximo jueves y hasta el domingo (del 4 al 8 de Sept.) celebramos el 
"Homenaje a la Tierra", al abrigo de la montaña de Montserrat, donde 
dispondremos de cuatro escenarios para celebrar simultáneamente conferencias, 
talleres, conciertos musicales y muchas más actividades. ¡No te lo pierdas! 
Será un espectáculo único.

CONFERENCIAS:

                

24 conferenciantes internacionales que nos hablaran de espiritualidad, 
educación, terapias, alimentación, salud, energías libres y conciencia, el 
jueves y viernes tarde y el fin de semana completo. Leer más…



TERAPIAS:

                

La clave de las terapias alternativas es entender el cuerpo de forma holística, 
y no tan sólo como una entidad fisica. Podremos disfrutar con numerosos 
talleres cada día. Leer más…



YOGA Y MEDITACIÓN:

                

Los mejores maestros del arte ancestral del yoga y la meditación ofrecerán 
todos los días actividades variadas y en abierto a todos los asistentes al 
evento. Leer más…



TRADICIONES ESPIRITUALES:

                

En un mundo donde el materialismo impera, se torna necesario recuperar los 
importantes valores espirituales del ser humano. Leer más…



MÚSICA:

        

Las vibraciones de la música y la danza serán componentes importantes en la 
conexion con la Madre Tierra en este su Homenaje, con participantes de 
diferentes partes del mundo: Africa, India, Marruecos , Tibet, America Latina, 
España, Rusia, Irlanda, y muchos más. Leer más…



Y si no puedes venir puedes realizar, DESDE TU ORDENADOR, los CURSOS ON LINE.


JUEVES, 5 (16:30 – 19:30 h)



Miguel Ferrero


MIGUEL FERRERO

“Valorización del plástico a combustible”

En el taller de Miguel Ferrero podremos ver en directo este procedimiento de 
transformación del plástico conocido como pirolisis, que convierte los 
plásticos tipo 2, 4 5 y 6 como por ejemplo las botellas de agua y refresco o 
los envases de los productos alimenticios en un óleo mixto y, posteriormente, 
en cualquier derivado del mismo que pueda ser utilizado como combustible: 
gasolina, gasoil o keroseno.

JUEVES, 5 (19:30 – 22:30 h)



José Luís Tejero


JOSÉ LUÍS TEJERO

“Hidrógeno, háztelo tú mismo”

Porqué se nos esconde una posibilidad tal de liberación, grandes inventores y 
luchadores intentaron conseguir para este mundo un mejor acceso a la energía 
sin éxito. En estos tiempos que corren de dificultades y falsas promesas seria 
el santo grial para la economía o tal vez no. No dejes de escuchar la 
presentación donde pondré algunas cartas sobre la mesa para entender mejor la 
realidad energética de hoy.

VIERNES, 6 (16:30 – 19:30 h)



Félix Rodrigo Mora


FÉLIX RODRIGO MORA

“Estetizar y erotizar la vida. Creando vitalidad, esplendor y sublimidad”

“En unos tiempos de bajo tono vital y depresión, cuando el sujeto medio se 
siente apático e incluso exhausto, necesitamos retomar dos de las expresiones 
capitales de lo humano, la estética y la erótica, para euforizar nuestras 
vidas, haciéndolas poderosas y magníficas”.

VIERNES, 6 (19:30 – 22:30 h)



Olga Porqueras


OLGA PORQUERAS

“La importancia de la comunicación con otras especies y principios básicos para 
establecer una comunicación consciente”

En este taller tendremos la posibilidad de abrir la puerta a la comunicación 
con otras especies pudiendo acceder a ese instinto dormido pero no olvidado de 
nuestro primer lenguaje el lenguaje universal, el lenguaje sin palabras. 
(Material opcional: 1 fotografía de un animal que conozcáis impreso en papel 
para una práctica).

SÁBADO, 7 (16:30 – 19:30 h)



Júlio Tzotar


JÚLIO TZOTAR

“Traumas, karmas, reflejos”

Ahora es el momento de que toda la humanidad se eleve, creando y formando parte 
de una nueva civilización. Una civilización de Iluminados. Por ello ahora es el 
momento de que el mayor regalo que Dios nos pueda dar después de la Vida, se 
haga manifiesto. La Alquimia esa cualidad de Dios en nosotros se expandirá a 
través de todas las personas que se sientan atraídas por este regalo divino.

SÁBADO, 7 (19:30 – 22:30 h)



Luís Arturo Frutos


LUÍS ARTURO FRUTOS

“Reconexión”

Hará surgir el potencial completo de los seres humanos a través de la 
aplicación de la ciencia en el proceso evolutivo espiritual. Más exacto aplica 
la Biometría y Bioenergía en seres humanos y entiende como su misión: “Integrar 
en las persona los procesos de consciencia que permiten su funcionamiento 
alineado y auto suficiente, con la estabilidad mental, emocional, espiritual y 
auto desarrollo de su salud integral.

DOMINGO, 8 (16:30 – 19:30 h)



Clara Bueno


CLARA BUENO

“La Danza Arkana Karana la danza del Alma y la transformación”

Danza en todos tus cuerpos (físico, mental, emocional, y espiritual). 
Aplicación de la metodología en distintos estilos de Danza. En el taller se 
mostrará entre otros: reestructuración postural, la activación de los centros 
energéticos o la r

Reminder: openid and gerrit

[Norbert Thiebaud]

If you need to add a new openid to your current gerrit account:

log-in with you existing valid openid... then go Setting... , then Identities
add you new identities there... make sure you complete the email hand-shake


then and only then, you can log on with your new identity

if you try to use a new identity up front, gerrit will create a new
account for you... it is not very good at detecting that you want to
use the same email/username... which create some confusion, and need
some manual SQL clean-up to fix.
So please be kind to your gerrit admin, and avoid that :-)

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

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

[Caolán McNamara]

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

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

[Caolán McNamara]

 include/sfx2/tbxctrl.hxx |4 
 sfx2/source/toolbox/tbxitem.cxx  |   17 +
 sw/source/ui/inc/navipi.hxx  |2 +-
 sw/source/ui/inc/workctrl.hxx|2 +-
 sw/source/ui/ribbar/workctrl.cxx |8 
 sw/source/ui/utlui/navipi.cxx|9 -
 6 files changed, 31 insertions(+), 11 deletions(-)

New commits:
commit ff7414a97f5ded66a8e8c8611ad801b1e6c11c9e
Author: Caolán McNamara 
Date:   Tue Sep 3 16:46:22 2013 +0100

Resolves: fdo#68726 make navigator child dialog float on top

i.e. set its parent to the thing it wants to be on top of

As an aside I'm not entirely sure that this little dialog has the 
decorations
set on it that it would like, I suspect it wants to be more like the
tearable-off font color floatingwindow. But lets not muddy the waters in 
this
commit.

Change-Id: I9e0c35fbb66e50c04c7b28904d3937cf9ae417f4

diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index af1b1a6..3d403766 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -146,6 +146,10 @@ public:
 const 
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
 Window* pParentWindow,
 WinBits nBits );
+SfxPopupWindow( sal_uInt16 nId,
+const 
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame,
+Window* pParentWindow,
+const ResId &rId );
 ~SfxPopupWindow();
 
 virtual SfxPopupWindow* Clone() const;
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index ea1d317..928b771 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1208,6 +1208,23 @@ SfxPopupWindow::SfxPopupWindow(
 ((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this );
 }
 
+SfxPopupWindow::SfxPopupWindow(
+sal_uInt16 nId,
+const Reference< XFrame >& rFrame,
+Window* pParentWindow,
+const ResId &rId ) :
+FloatingWindow( pParentWindow, rId )
+, m_bFloating(sal_False)
+, m_bCascading( sal_False )
+, m_nId( nId )
+, m_xFrame( rFrame )
+, m_pStatusListener( 0 )
+{
+Window* pWindow = GetTopMostParentSystemWindow( this );
+if ( pWindow )
+((SystemWindow *)pWindow)->GetTaskPaneList()->AddWindow( this );
+}
+
 //
 
 SfxPopupWindow::~SfxPopupWindow()
diff --git a/sw/source/ui/inc/navipi.hxx b/sw/source/ui/inc/navipi.hxx
index 1082a6a..4e339cf 100644
--- a/sw/source/ui/inc/navipi.hxx
+++ b/sw/source/ui/inc/navipi.hxx
@@ -168,7 +168,7 @@ public:
 sal_BoolIsGlobalMode() const {returnbGlobalMode;}
 
 SwView* GetCreateView() const;
-voidCreateNavigationTool(const Rectangle& rRect, bool 
bSetFocus);
+voidCreateNavigationTool(const Rectangle& rRect, bool 
bSetFocus, Window *pParent);
 };
 
 class SwNavigationChild : public SfxChildWindowContext
diff --git a/sw/source/ui/inc/workctrl.hxx b/sw/source/ui/inc/workctrl.hxx
index be38a29..dcba591 100644
--- a/sw/source/ui/inc/workctrl.hxx
+++ b/sw/source/ui/inc/workctrl.hxx
@@ -162,7 +162,7 @@ protected:
 virtual voidDataChanged( const DataChangedEvent& rDCEvt );
 
 public:
-SwScrollNaviPopup( sal_uInt16 nId, const 
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame );
+SwScrollNaviPopup( sal_uInt16 nId, const 
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, 
Window *pParent );
 ~SwScrollNaviPopup();
 
 static String   GetQuickHelpText(sal_Bool bNext);
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index 91d8f59..0c92c28 100644
--- a/sw/source/ui/ribbar/workctrl.cxx
+++ b/sw/source/ui/ribbar/workctrl.cxx
@@ -452,8 +452,8 @@ static const char* aNavigationHelpIds[ NAVI_ENTRIES ] =
 HID_NID_NEXT
 };
 
-SwScrollNaviPopup::SwScrollNaviPopup( sal_uInt16 nId, const Reference< XFrame 
>& rFrame )
-: SfxPopupWindow(nId, rFrame, SW_RES(RID_SCROLL_NAVIGATION_WIN) ),
+SwScrollNaviPopup::SwScrollNaviPopup(sal_uInt16 nId, const Reference< XFrame 
>& rFrame, Window *pParent)
+: SfxPopupWindow(nId, rFrame, pParent, SW_RES(RID_SCROLL_NAVIGATION_WIN)),
 aToolBox(this, 0),
 aSeparator(this, SW_RES(FL_SEP)),
 aInfoField(this, SW_RES(FI_INFO)),
@@ -540,7 +540,7 @@ void SwScrollNaviPopup::ApplyImageList()
 
 SfxPopupWindow* SwScrollNaviPopup::Clone() const
 {
-return new SwScrollNaviPopup( GetId(), GetFrame() );
+return new SwScrollNaviPopup( GetId(), GetFrame(), GetParent() );
 }
 
 IMPL_LINK(SwScrollNaviPopup, SelectHdl, ToolBox*, pSet)
@@ -602,7 +6

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

[Michael Stahl]

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

New commits:
commit c91f7082180d1ca90467891f3b7ca9a3e845d9e7
Author: Michael Stahl 
Date:   Tue Sep 3 17:27:44 2013 +0200

fdo#68731: vcl: fix path for bundled fonts on Windows

WinSalGraphics::GetDevFontList(): remove the obsolete "Basis" from
the search path to find the bundled fonts.

Change-Id: I7d7d650243592944e3339dd75caf29f2b2fe6670

diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx
index d8e5782..09a907a 100644
--- a/vcl/win/source/gdi/salgdi3.cxx
+++ b/vcl/win/source/gdi/salgdi3.cxx
@@ -2184,7 +2184,7 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* 
pFontList )
 osl_getExecutableFile( &aPath.pData );
 aPath = aPath.copy( 0, aPath.lastIndexOf('/') );
 String aFontDirUrl = aPath.copy( 0, aPath.lastIndexOf('/') );
-aFontDirUrl += String( RTL_CONSTASCII_USTRINGPARAM("/Basis/" 
LIBO_SHARE_FOLDER "/fonts/truetype") );
+aFontDirUrl += OUString("/" LIBO_SHARE_FOLDER "/fonts/truetype");
 
 // collect fonts in font path that could not be registered
 osl::Directory aFontDir( aFontDirUrl );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: openssl/UnpackedTarball_openssl.mk

[Tor Lillqvist]

 openssl/UnpackedTarball_openssl.mk |   24 
 1 file changed, 24 insertions(+)

New commits:
commit d8d26ba1565d597e333dc474b13d8e63fe31976d
Author: Tor Lillqvist 
Date:   Tue Sep 3 18:23:42 2013 +0300

More headers need un-symlinking for MSVC

Change-Id: Ic5f0bfab4a729b0abca332454817aa899a5adc6f

diff --git a/openssl/UnpackedTarball_openssl.mk 
b/openssl/UnpackedTarball_openssl.mk
index cd59f7d..e7fdfce 100644
--- a/openssl/UnpackedTarball_openssl.mk
+++ b/openssl/UnpackedTarball_openssl.mk
@@ -13,19 +13,30 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,openssl,$(OPENSSL_TARBALL),,openssl
 
 # hack to fix symlinks with MSVC
 $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
+   include/openssl/aes.h \
include/openssl/asn1.h \
+   include/openssl/asn1_mac.h \
+   include/openssl/asn1t.h \
include/openssl/bio.h \
+   include/openssl/blowfish.h \
include/openssl/bn.h \
include/openssl/buffer.h \
+   include/openssl/camellia.h \
+   include/openssl/cast.h \
+   include/openssl/cmac.h \
+   include/openssl/cms.h \
include/openssl/comp.h \
include/openssl/conf.h \
+   include/openssl/conf_api.h \
include/openssl/crypto.h \
include/openssl/des.h \
include/openssl/des_old.h \
include/openssl/dh.h \
include/openssl/dsa.h \
+   include/openssl/dso.h \
include/openssl/dtls1.h \
include/openssl/e_os2.h \
+   include/openssl/ebcdic.h \
include/openssl/ec.h \
include/openssl/ecdh.h \
include/openssl/ecdsa.h \
@@ -33,12 +44,17 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
include/openssl/err.h \
include/openssl/evp.h \
include/openssl/hmac.h \
+   include/openssl/idea.h \
+   include/openssl/krb5_asn.h \
include/openssl/kssl.h \
include/openssl/lhash.h \
include/openssl/md4.h \
include/openssl/md5.h \
+   include/openssl/mdc2.h \
+   include/openssl/modes.h \
include/openssl/obj_mac.h \
include/openssl/objects.h \
+   include/openssl/ocsp.h \
include/openssl/opensslconf.h \
include/openssl/opensslv.h \
include/openssl/ossl_typ.h \
@@ -48,10 +64,15 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
include/openssl/pkcs7.h \
include/openssl/pqueue.h \
include/openssl/rand.h \
+   include/openssl/rc2.h \
+   include/openssl/rc4.h \
include/openssl/ripemd.h \
include/openssl/rsa.h \
include/openssl/safestack.h \
+   include/openssl/seed.h \
include/openssl/sha.h \
+   include/openssl/srp.h \
+   include/openssl/srtp.h \
include/openssl/ssl.h \
include/openssl/ssl2.h \
include/openssl/ssl23.h \
@@ -59,8 +80,11 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
include/openssl/stack.h \
include/openssl/symhacks.h \
include/openssl/tls1.h \
+   include/openssl/ts.h \
+   include/openssl/txt_db.h \
include/openssl/ui.h \
include/openssl/ui_compat.h \
+   include/openssl/whrlpool.h \
include/openssl/x509.h \
include/openssl/x509_vfy.h \
include/openssl/x509v3.h \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: is there a portable version of libre office for win 7 ?

[Tommy]

On Tue, 03 Sep 2013 15:11:29 +0200, Pedro  wrote:


Actually there are two portable versions.

The one suggested by Christian and X-LibreOffice from winPenPack.

You can get the latest version from
http://www.winpenpack.com/en/download.php?view.1354
or choose any specific version from
http://sourceforge.net/projects/winpenpack/files/X-LibreOffice/releases/

Hope this helps!



I tried both version and I can tell that IMHO the winPenPack portable  
version is better that the one from PortableApps.


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

[Libreoffice-commits] core.git: Branch 'libreoffice-4-1' - configure.ac

[Christian Lohmaier]

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

New commits:
commit bdcb0c43c72b0e682612c88cdc0796f921c7f67d
Author: Christian Lohmaier 
Date:   Tue Sep 3 17:46:14 2013 +0200

bump product version to 4.1.3.0.0+

Change-Id: I8a76e8f6c6a5e25f1ba7dd1ad47d54044fecbb9b

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

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

[Tor Lillqvist]

 cppuhelper/source/shlib.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit ecb1850b2d32e509050be9a323cf124fe2af5277
Author: Tor Lillqvist 
Date:   Tue Sep 3 14:39:06 2013 +0300

Can unify this now it seems

Change-Id: I2fd0e1967028ad6632b39dfaaf377c7186a89229

diff --git a/cppuhelper/source/shlib.cxx b/cppuhelper/source/shlib.cxx
index f61f2bc..fc8b6a8 100644
--- a/cppuhelper/source/shlib.cxx
+++ b/cppuhelper/source/shlib.cxx
@@ -535,17 +535,9 @@ Reference< XInterface > SAL_CALL 
loadSharedLibComponentFactory(
 { "bootstrap.uno.a", bootstrap_component_getFactory },
 { "libbootstraplo.a", bootstrap_component_getFactory },
 
-// The .uno ones seem to consistently have a "lib" prefix now for 
Android,
-// but not iOS, hmm.
-#ifdef ANDROID
 { "libintrospectionlo.a", introspection_component_getFactory },
 { "libreflectionlo.a", reflection_component_getFactory },
 { "libstocserviceslo.a", stocservices_component_getFactory },
-#else
-{ "introspection.uno.a", introspection_component_getFactory },
-{ "reflection.uno.a", reflection_component_getFactory },
-{ "stocservices.uno.a", stocservices_component_getFactory },
-#endif
 { "libcomphelper.a", comphelp_component_getFactory },
 { "libconfigmgrlo.a", configmgr_component_getFactory },
 { "libdeployment.a", deployment_component_getFactory },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

New branch 'libreoffice-4-1-2' available with the following commits:
commit 84797cbc28438267130671c9c602e1559e3d8125
Author: Christian Lohmaier 
Date:   Tue Sep 3 17:40:40 2013 +0200

Branch libreoffice-4-1-2

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

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

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

Change-Id: I35d628b62e458fe65cf6af9f75d6b635af61ee35

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

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

[Christian Lohmaier]

New branch 'libreoffice-4-1-2' available with the following commits:
commit e85fda38030d225ad56d5c90574ceadc390e7cec
Author: Christian Lohmaier 
Date:   Tue Sep 3 17:40:40 2013 +0200

Branch libreoffice-4-1-2

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

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

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

Change-Id: I60eb5ea781cdb7521a2130c4d1124647dbfc12b1

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

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

[Christian Lohmaier]

New branch 'libreoffice-4-1-2' available with the following commits:
commit 33b0b78a27e1821fed7ec18bb9b2bcb8ddda6ca4
Author: Christian Lohmaier 
Date:   Tue Sep 3 17:40:40 2013 +0200

Branch libreoffice-4-1-2

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

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

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

Change-Id: Ie4db3b7db234e939c4e26eaaabd700d2a214f554

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

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

[Miklos Vajna]

 sw/qa/extras/inc/swmodeltestbase.hxx |   12 ++
 sw/qa/extras/ooxmlimport/data/fdo68607.docx  |binary
 sw/qa/extras/ooxmlimport/data/table-auto-nested.docx |binary
 sw/qa/extras/ooxmlimport/data/table-floating.docx|binary
 sw/qa/extras/ooxmlimport/data/table-pagebreak.docx   |binary
 sw/qa/extras/ooxmlimport/data/table-style-parprop.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   64 +++
 writerfilter/source/dmapper/DomainMapper.cxx |   19 ++-
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   85 +--
 writerfilter/source/dmapper/DomainMapperTableHandler.hxx |4 
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   11 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx|9 +
 writerfilter/source/dmapper/DomainMapper_Impl.hxx|9 +
 writerfilter/source/dmapper/PropertyMap.cxx  |5 
 writerfilter/source/dmapper/PropertyMap.hxx  |3 
 writerfilter/source/dmapper/TablePositionHandler.cxx |   12 +-
 writerfilter/source/dmapper/TablePositionHandler.hxx |2 
 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx|   10 +
 writerfilter/source/ooxml/model.xml  |1 
 19 files changed, 227 insertions(+), 19 deletions(-)

New commits:
commit d34ce87ddd17a66a074f47d11d8931e1d8594d64
Author: Miklos Vajna 
Date:   Tue Sep 3 11:52:51 2013 +0200

fdo#68607 bnc#816593 DomainMapperTableHandler: don't always start a frame

This is a port of commit 8fe8bd6c3b5b1a539b7370f8c457fa69c061d2de
"Related: fdo#61594 SwWW8ImplReader::StartApo: don't always start a
frame" from the WW8 filter to the DOCX one.

(regression from edc4861a68e0269b83b17e0ec57912a1ce4220ad)

(cherry picked from commit 78d1f1c2835b9fae0f91ed771fc1d594c7817502)

Change-Id: If1bb4a8a3786aacd618585cf859b57ce9be85c51

diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx 
b/sw/qa/extras/inc/swmodeltestbase.hxx
index a4e8213..cf37f7f 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -27,9 +27,11 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -248,6 +250,16 @@ protected:
 return getProperty(getProperty< 
uno::Reference >(xFormula, "Model"), "Formula");
 }
 
+/// Get page count.
+int getPages()
+{
+uno::Reference xModel(mxComponent, uno::UNO_QUERY);
+uno::Reference 
xTextViewCursorSupplier(xModel->getCurrentController(), uno::UNO_QUERY);
+uno::Reference 
xCursor(xTextViewCursorSupplier->getViewCursor(), uno::UNO_QUERY);
+xCursor->jumpToLastPage();
+return xCursor->getPage();
+}
+
 uno::Reference mxComponent;
 xmlBufferPtr mpXmlBuffer;
 
diff --git a/sw/qa/extras/ooxmlimport/data/fdo68607.docx 
b/sw/qa/extras/ooxmlimport/data/fdo68607.docx
new file mode 100644
index 000..11f5706
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/fdo68607.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 4da8664..4d6733a 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -134,6 +134,7 @@ public:
 void testTableAutoNested();
 void testTableStyleParprop();
 void testTablePagebreak();
+void testFdo68607();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -217,6 +218,7 @@ void Test::run()
 {"table-auto-nested.docx", &Test::testTableAutoNested},
 {"table-style-parprop.docx", &Test::testTableStyleParprop},
 {"table-pagebreak.docx", &Test::testTablePagebreak},
+{"fdo68607.docx", &Test::testFdo68607},
 };
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
 {
@@ -1360,6 +1362,14 @@ void Test::testTablePagebreak()
 CPPUNIT_ASSERT_EQUAL(style::BreakType_PAGE_BEFORE, 
getProperty(getParagraph(3), "BreakType"));
 }
 
+void Test::testFdo68607()
+{
+// Bugdoc was 8 pages in Word, 1 in Writer due to pointlessly wrapping the
+// table in a frame. Exact layout may depend on fonts available, etc. --
+// but at least make sure that our table spans over multiple pages now.
+CPPUNIT_ASSERT(getPages() > 1);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx 
b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
index 546ff20..571ef77 100644
--- a/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
+++ b/writerfilter/source/dmapper/DomainMapperTableHandler.cxx
@@ -764,7 +764,20 @@ void DomainMapperTableHandler::endTable(unsigned int 
nestedTableLevel)
 {
 uno::Reference xStart;
 uno::Reference xEnd;
-bool bFloating = aFrameProperties.hasElements();
+
+bool bNoFly = false;
+if (SectionProp

[Libreoffice-commits] core.git: 2 commits - download.lst openssl/openssl-asm-fix.patch openssl/opensslios.patch openssl/openssllnx.patch openssl/opensslwnt.patch openssl/UnpackedTarball_openssl.mk sal

[Tor Lillqvist]

 download.lst   |2 -
 openssl/UnpackedTarball_openssl.mk |3 -
 openssl/openssl-asm-fix.patch  |   11 --
 openssl/opensslios.patch   |6 +--
 openssl/openssllnx.patch   |   59 -
 openssl/opensslwnt.patch   |   31 ++-
 sal/Library_sal.mk |   14 +++-
 sal/osl/unx/file.cxx   |2 -
 sal/osl/unx/uunxapi.cxx|2 -
 sal/osl/unx/uunxapi.mm |1 
 10 files changed, 37 insertions(+), 94 deletions(-)

New commits:
commit d81da41c9d121f5ec452545b686a71c51a117eed
Author: Tor Lillqvist 
Date:   Tue Sep 3 16:50:50 2013 +0300

Don't compile all of the sal library as Objective-C++ on OS X after all

I doubt it affects ABI, but let's not take the risk.

Instead, just compile the uunxapi.cxx file (which has no public API)
as Objective-C++, as that is now the only one where Objective-C API is
used.

This reverts part of d22c94dbf16d18bce39f060aa21f3083169426ca

Change-Id: I240dbb36529c419b81b062f6fe860a9e621c2400

diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 093546f..8024e3f 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -123,7 +123,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/all/filepath \
 ))
 
-ifneq (,$(filter IOS MACOSX,$(OS)))
+ifeq ($(OS),IOS)
 $(eval $(call gb_Library_add_cxxflags,sal,\
 $(gb_OBJCXXFLAGS) \
 ))
@@ -162,7 +162,6 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/process \
sal/osl/unx/process_impl \
 $(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \
-   sal/osl/unx/uunxapi \
 ))
 $(eval $(call gb_Library_add_cobjects,sal,\
sal/osl/unx/mutex \
@@ -183,6 +182,17 @@ $(eval $(call 
gb_Library_add_cobject,sal,sal/osl/unx/signal, \
-DSAL_ENABLE_CRASH_REPORT) \
 ))
 
+# Note that the uunxapi.mm file just includes the uunxapi.cxx one
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_objcxxobjects,sal,\
+   sal/osl/unx/uunxapi \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,sal,\
+   sal/osl/unx/uunxapi \
+))
+endif
+
 ifneq ($(filter $(OS),MACOSX IOS),)
 $(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/osxlocale \
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index 4ae6ef6..571a79c 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- 
*/
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sal/osl/unx/uunxapi.cxx b/sal/osl/unx/uunxapi.cxx
index 316f75a..d411645 100644
--- a/sal/osl/unx/uunxapi.cxx
+++ b/sal/osl/unx/uunxapi.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: ObjC; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- 
*/
 /*
  * This file is part of the LibreOffice project.
  *
diff --git a/sal/osl/unx/uunxapi.mm b/sal/osl/unx/uunxapi.mm
new file mode 100644
index 000..5a7e17f
--- /dev/null
+++ b/sal/osl/unx/uunxapi.mm
@@ -0,0 +1 @@
+#include "uunxapi.cxx"
commit dd3293b83aa7bdb5688005d3906a0de536631487
Author: Tor Lillqvist 
Date:   Fri Aug 30 19:56:52 2013 +0300

Upgrade the bundled OpenSSL to 1.0.1e

Change-Id: I5bc15cd2a6e35a7e4dd203ceffb3b49e5949855c

diff --git a/download.lst b/download.lst
index b5a6efc..11fe899 100644
--- a/download.lst
+++ b/download.lst
@@ -77,7 +77,7 @@ export NEON_TARBALL := 
ff369e69ef0f0143beb5626164e87ae2-neon-0.29.5.tar.gz
 export NSS_TARBALL := 
a0a861f539f0e7a91d05e6b9457e4db1-nss-3.13.5-with-nspr-4.9.1.tar.gz
 export ODFGEN_TARBALL := 
8473296c671b6e3dd8197f4145e0854b-libodfgen-0.0.2.tar.bz2
 export OPENLDAP_TARBALL := 804c6cb5698db30b75ad0ff1c25baefd-openldap-2.4.31.tgz
-export OPENSSL_TARBALL := 
51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
+export OPENSSL_TARBALL := 
66bf6f10f060d561929de96f9dfe5b8c-openssl-1.0.1e.tar.gz
 export ORCUS_TARBALL := ea2acaf140ae40a87a952caa75184f4d-liborcus-0.5.1.tar.bz2
 export PIXMAN_TARBALL := c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
 export PNG_TARBALL := 9e5d864bce8f06751bbd99962ecf4aad-libpng-1.5.10.tar.gz
diff --git a/openssl/UnpackedTarball_openssl.mk 
b/openssl/UnpackedTarball_openssl.mk
index 92ce3da..cd59f7d 100644
--- a/openssl/UnpackedTarball_openssl.mk
+++ b/openssl/UnpackedTarball_openssl.mk
@@ -46,7 +46,6 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
include/openssl/pem2.h \
include/openssl/pkcs12.h \
include/openssl/pkcs7.h \
-   include/openssl/pq_compat.h \
include/openssl/pqueue.h \
include/openssl/rand.h \
include/openssl/ripemd.h \
@@ -58,7 +57,6 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
include/openssl/ssl

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

[Ivan Timofeev]

 sw/source/filter/html/css1atr.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3103306f4753f546f881cfc6bcdb357d4e1857d8
Author: Ivan Timofeev 
Date:   Tue Sep 3 18:57:42 2013 +0400

fix html export of line spacing

regression from 84931eb8aeeb55a2570edb24f5c2d3409f9c2398

Change-Id: Ifcedcd34721a1ca162495f57ad36cfc6859ab0c4

diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index 308f46f..4fae564 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -2866,7 +2866,7 @@ static Writer& OutCSS1_SvxLineSpacing( Writer& rWrt, 
const SfxPoolItem& rHt )
 rHTMLWrt.OutCSS1_UnitProperty( sCSS1_P_line_height, (long)nHeight );
 else if( nPrcHeight )
 {
-OString sHeight(OString(nPrcHeight) + "%");
+OString sHeight(OString::number(nPrcHeight) + "%");
 rHTMLWrt.OutCSS1_PropertyAscii(sCSS1_P_line_height, sHeight);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 54157] LibreOffice 4.0 most annoying bugs

[bugzilla-daemon]

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

Bug 54157 depends on bug 68607, which changed state.

Bug 68607 Summary: FILEOPEN: 8 page word document only displays page one
https://bugs.freedesktop.org/show_bug.cgi?id=68607

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

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

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

[Ivan Timofeev]

 sw/source/filter/html/css1atr.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a8865e5df62b5f33aa769d459b9823eb5b110d4b
Author: Ivan Timofeev 
Date:   Tue Sep 3 18:00:11 2013 +0400

fix html export of SfxPoolItems

hintids.hxx and SwAttrFnTab were out of sync => wrong functions were called.

regression from 288bcd68bdccd7a57b2c6da2c0bb91b71e8fcd3b

Change-Id: I2a8a68178249f6a4a8a82f38960b046850f7368b

diff --git a/sw/source/filter/html/css1atr.cxx 
b/sw/source/filter/html/css1atr.cxx
index bd77d3c..308f46f 100644
--- a/sw/source/filter/html/css1atr.cxx
+++ b/sw/source/filter/html/css1atr.cxx
@@ -3682,6 +3682,7 @@ SwAttrFnTab aCSS1AttrFnTab = {
 /* RES_PARATR_CONNECT_TO_BORDER */  0, // new
 /* RES_PARATR_OUTLINELEVEL */   0, // new since cws outlinelevel
 /* RES_PARATR_RSID */   0, // new
+/* RES_PARATR_GRABBAG */0,
 
 /* RES_PARATR_LIST_ID */0, // new
 /* RES_PARATR_LIST_LEVEL */ 0, // new
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: FW: Smart-Art in Writer - Correct 'Import' approach ?

[Adam Fyne]

On Tue, Sep 3, 2013 at 4:48 PM, Miklos Vajna  wrote:

> Hi,
>
> On Tue, Sep 03, 2013 at 03:26:31PM +0300, Adam Fyne 
> wrote:
> > > > we would like to change this and show the user a *locked* bitmap of
> the
> > > > smart-art, that the user cannot manipulate (so that he can at least
> > > > preserve the original Smart-Art).
> > >
> > > What is the benefit of this, from a user's point of view?
> >
> > Because at this phase, we are not going to add logic to 'manipulate' the
> > Smart-Art object,
> > so if a user is allowed to changed the location of the shapes, and then
> > saves back the file - and opens it in Word -
> > he won't understand why his 'changes' to the shapes weren't persisted.
> > That's why we believe it is best to simply not allow any changes, because
> > they won't be persisted anyway.
>
> Hmm, when we discussed the InteropGrabBag idea in the ESC call, AIUI the
> proposed solution for the "attached unhandled meatada vs user editing"
> problem was to empty the InteropGrabBag in case the user edits the
> object in question:
>
> http://lists.freedesktop.org/archives/libreoffice/2013-July/054428.html
>
> "invalidate on copy/mutate"
>
> This way, in case of no editing, the metadata is kept, in case of
> editing, the edited object is exported as a normal groupshape and the
> user's modifications win over the unhandled metadata.
>
> > The idea was to show a single pop-up for 'all Smart-Art' objects in the
> > file - asking
> > "do you want to convert the Smart-Art in this file to simple shapes (and
> > lose functionallity) or preserve the original Smart-Art objects ?"
>
> Ah, that sounds better. And then would you do this for all filters that
> may contain smartart: PPTX, DOCX, XLSX? (Not sure if we support smartart
> inside XLSX ATM.) If so, opinion from someone hacking Impress would be
> appreciated.
>

Currently - the scope of the work is for DOCX.


> Miklos
>



-- 

[image: appicon.png]


*Adam Fyne*

Twitter  |
LinkedIn
 | Facebook  |
Blog
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: FW: Smart-Art in Writer - Correct 'Import' approach ?

[Miklos Vajna]

Hi,

On Tue, Sep 03, 2013 at 03:26:31PM +0300, Adam Fyne  
wrote:
> > > we would like to change this and show the user a *locked* bitmap of the
> > > smart-art, that the user cannot manipulate (so that he can at least
> > > preserve the original Smart-Art).
> >
> > What is the benefit of this, from a user's point of view?
> 
> Because at this phase, we are not going to add logic to 'manipulate' the
> Smart-Art object,
> so if a user is allowed to changed the location of the shapes, and then
> saves back the file - and opens it in Word -
> he won't understand why his 'changes' to the shapes weren't persisted.
> That's why we believe it is best to simply not allow any changes, because
> they won't be persisted anyway.

Hmm, when we discussed the InteropGrabBag idea in the ESC call, AIUI the
proposed solution for the "attached unhandled meatada vs user editing"
problem was to empty the InteropGrabBag in case the user edits the
object in question:

http://lists.freedesktop.org/archives/libreoffice/2013-July/054428.html

"invalidate on copy/mutate"

This way, in case of no editing, the metadata is kept, in case of
editing, the edited object is exported as a normal groupshape and the
user's modifications win over the unhandled metadata.

> The idea was to show a single pop-up for 'all Smart-Art' objects in the
> file - asking
> "do you want to convert the Smart-Art in this file to simple shapes (and
> lose functionallity) or preserve the original Smart-Art objects ?"

Ah, that sounds better. And then would you do this for all filters that
may contain smartart: PPTX, DOCX, XLSX? (Not sure if we support smartart
inside XLSX ATM.) If so, opinion from someone hacking Impress would be
appreciated.

Miklos


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

Re: is there a portable version of libre office for win 7 ?

[Pedro]

Actually there are two portable versions.

The one suggested by Christian and X-LibreOffice from winPenPack.

You can get the latest version from
http://www.winpenpack.com/en/download.php?view.1354
or choose any specific version from
http://sourceforge.net/projects/winpenpack/files/X-LibreOffice/releases/

Hope this helps!



--
View this message in context: 
http://nabble.documentfoundation.org/is-there-a-portable-version-of-libre-office-for-win-7-tp4072807p4072815.html
Sent from the Dev mailing list archive at Nabble.com.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 include/svx/svdxcgv.hxx   |2 
 include/svx/xtable.hxx|2 
 svx/source/form/fmpgeimp.cxx  |5 -
 svx/source/form/tbxform.cxx   |4 
 svx/source/svdraw/svdxcgv.cxx |4 
 svx/source/xoutdev/xtable.cxx |4 
 sw/source/filter/ww8/ww8graf.cxx  |  116 ---
 sw/source/filter/ww8/ww8par.cxx   |2 
 sw/source/filter/ww8/ww8par.hxx   |   73 -
 sw/source/filter/ww8/ww8par3.cxx  |   27 +++---
 sw/source/filter/ww8/ww8par5.cxx  |  160 +++---
 sw/source/filter/ww8/ww8scan.cxx  |   16 +--
 sw/source/filter/ww8/ww8scan.hxx  |2 
 sw/source/filter/ww8/ww8struc.hxx |1 
 14 files changed, 204 insertions(+), 214 deletions(-)

New commits:
commit f46f23a109a18d0e89d3fab7fed65b50d1c00751
Author: Caolán McNamara 
Date:   Tue Sep 3 13:30:35 2013 +0100

XubString->OUString

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

diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx
index 1817576..b61456a 100644
--- a/include/svx/svdxcgv.hxx
+++ b/include/svx/svdxcgv.hxx
@@ -104,7 +104,7 @@ public:
 // Gueltige Werte fuer nOptions sind SDRINSERT_DONTMARK und
 // SDRINSERT_ADDMARK (siehe svdedtv.hxx).
 virtual sal_BoolPaste(const SdrModel& rMod, const Point& rPos, 
SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
-sal_BoolPaste(const String& rStr, const Point& rPos, 
SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
+sal_BoolPaste(const OUString& rStr, const Point& rPos, 
SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
 sal_BoolPaste(SvStream& rInput, const String& rBaseURL, 
sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 
nOptions=0);
 
 sal_BoolCut( sal_uIntPtr nFormat = SDR_ANYFORMAT );
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 194547a..e3aff13 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -222,7 +222,7 @@ public:
 XPropertyEntry* Remove(long nIndex);
 
 XPropertyEntry* Get(long nIndex) const;
-long GetIndex(const String& rName) const;
+long GetIndex(const OUString& rName) const;
 Bitmap GetUiBitmap(long nIndex) const;
 
 const String& GetName() const { return maName; }
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index 42a01e6..7331739 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -417,9 +417,8 @@ Reference< XForm >  FmFormPageImpl::getDefaultForm()
 if( pModel->IsUndoEnabled() )
 {
 OUString aStr(SVX_RESSTR(RID_STR_FORM));
-XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
-aUndoStr.SearchAndReplace(OUString('#'), aStr);
-pModel->BegUndo(aUndoStr);
+OUString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_INSERT));
+pModel->BegUndo(aUndoStr.replaceFirst("'#'", aStr));
 }
 
 try
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index c3c1b0b..36763c1 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -407,11 +407,11 @@ void SvxFmTbxCtlRecTotal::StateChanged( sal_uInt16 nSID, 
SfxItemState eState, co
 if (GetSlotId() != SID_FM_RECORD_TOTAL)
 return;
 
-XubString aText;
+OUString aText;
 if (pState)
 aText = ((SfxStringItem*)pState)->GetValue();
 else
-aText = '?';
+aText = "?";
 
 pFixedText->SetText( aText );
 pFixedText->Update();
diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx
index 5359d57..e690c20 100644
--- a/svx/source/svdraw/svdxcgv.cxx
+++ b/svx/source/svdraw/svdxcgv.cxx
@@ -125,9 +125,9 @@ sal_Bool SdrExchangeView::ImpGetPasteLayer(const 
SdrObjList* pObjList, SdrLayerI
 return bRet;
 }
 
-sal_Bool SdrExchangeView::Paste(const XubString& rStr, const Point& rPos, 
SdrObjList* pLst, sal_uInt32 nOptions)
+sal_Bool SdrExchangeView::Paste(const OUString& rStr, const Point& rPos, 
SdrObjList* pLst, sal_uInt32 nOptions)
 {
-if(!rStr.Len())
+if (rStr.isEmpty())
 return sal_False;
 
 Point aPos(rPos);
diff --git a/svx/source/xoutdev/xtable.cxx b/svx/source/xoutdev/xtable.cxx
index d020410..eca37ed 100644
--- a/svx/source/xoutdev/xtable.cxx
+++ b/svx/source/xoutdev/xtable.cxx
@@ -161,7 +161,7 @@ XPropertyEntry* XPropertyList::Get( long nIndex ) const
 return ( (size_t)nIndex < maList.size() ) ? maList[ nIndex ] : NULL;
 }
 
-long XPropertyList::GetIndex(const XubString& rName) const
+long XPropertyList::GetIndex(const OUString& rName) const
 {
 if( mbListDirty )
 {
@@ -170,7 +170,7 @@ long XPropertyList::GetIndex(const XubString& rName) const
 }
 
 for( long i = 0, n = maList.size(); i < n; ++i ) {
-if ( maList[ i ]->GetName() == rName 

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

[Tor Lillqvist]

 basctl/source/basicide/baside2b.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cbfe56c3bc7ae849f8ea9825445f5e2c5dc4dc00
Author: Tor Lillqvist 
Date:   Tue Sep 3 15:46:47 2013 +0300

WaE: C4101: 'ex' : unreferenced local variable

Change-Id: I804bafb4057e1bb409b7f30d79554f2773cb3967

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 69012cc..e2e5e72 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2901,7 +2901,7 @@ UnoTypeCodeCompletetor::UnoTypeCodeCompletetor( const 
std::vector< OUString >& a
 if( xRefl.is() )
 xClass = xRefl->forName( sVarType );//get the base class for 
reflection
 }
-catch( const Exception& ex )
+catch( const Exception& )
 {
 bCanComplete = false;
 return;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/ui/index/swuiidxmrk.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 23e32272393c239a950948e92d83b5b0748cedd8
Author: Caolán McNamara 
Date:   Mon Sep 2 21:26:49 2013 +0100

bDel is unused uninitialized

Change-Id: Idac3a6805700d896b8569d1df79d32ca493c48b3
(cherry picked from commit 91a557561c24c7532c525692f279b1fcfd520f92)
Reviewed-on: https://gerrit.libreoffice.org/5764
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/ui/index/swuiidxmrk.cxx 
b/sw/source/ui/index/swuiidxmrk.cxx
index e9cf706..c3fc58b 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -84,6 +84,7 @@ using namespace ::com::sun::star;
 SwIndexMarkPane::SwIndexMarkPane(Dialog &rDialog, sal_Bool bNewDlg,
 SwWrtShell& rWrtShell)
 : m_rDialog(rDialog)
+, bDel(false)
 , bNewMark(bNewDlg)
 , bSelected(sal_False)
 , bPhoneticED0_ChangedByUser(sal_False)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Cédric Bosdonnat]

 sw/qa/extras/ooxmlimport/data/n816593.docx   |binary
 sw/qa/extras/ooxmlimport/data/table_width.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |   15 +++
 writerfilter/inc/resourcemodel/TableData.hxx |5 +
 writerfilter/inc/resourcemodel/TableManager.hxx  |   31 ++-
 writerfilter/source/dmapper/DomainMapperTableHandler.cxx |   20 
 writerfilter/source/dmapper/DomainMapperTableManager.cxx |   61 ++-
 writerfilter/source/dmapper/DomainMapperTableManager.hxx |4 
 writerfilter/source/dmapper/TablePositionHandler.cxx |   10 ++
 writerfilter/source/dmapper/TablePositionHandler.hxx |2 
 writerfilter/source/ooxml/OOXMLParserState.cxx   |3 
 11 files changed, 139 insertions(+), 12 deletions(-)

New commits:
commit 2438ffef328ea1993f5b08ad3639e9bee7d29e90
Author: Cédric Bosdonnat 
Date:   Fri May 31 10:51:47 2013 +0200

n#816593: docx consecutive tables with different tblpPr needs to be split

When importing docx with 2  following each other, we have 2
possible behaviors: either merge them as one table as we did before or
split them into two tables. The tables need to be split if they have
different floating position properties.

This required the ooxml tokenizer to repeat the table properties for
each row of the table: or how would we know we don't need to split the
table?

The basic idea behind this hack is to temporarily store the table
position and table properties before saving them. Thus we can compare
them at the end of the row and decide to split the table or not.

(cherry picked from commit 173d24a7316fccf0e838f71b92c10a772b19298d)

Signed-off-by: Miklos Vajna 

Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx

Change-Id: I2e3e70dfe7386090fe356575ee9d0e81aa031dc4

diff --git a/sw/qa/extras/ooxmlimport/data/n816593.docx 
b/sw/qa/extras/ooxmlimport/data/n816593.docx
new file mode 100644
index 000..7d784e6
Binary files /dev/null and b/sw/qa/extras/ooxmlimport/data/n816593.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index 2d5441a..9a685c4 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -125,6 +125,7 @@ public:
 void testFdo43641();
 void testFdo46361();
 void testFdo65632();
+void testN816593();
 
 CPPUNIT_TEST_SUITE(Test);
 #if !defined(MACOSX) && !defined(WNT)
@@ -215,6 +216,7 @@ void Test::run()
 {"fdo43641.docx", &Test::testFdo43641},
 {"fdo46361.docx", &Test::testFdo46361},
 {"fdo65632.docx", &Test::testFdo65632},
+{"n816593.docx", &Test::testN816593},
 };
 header();
 for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i)
@@ -1528,6 +1530,15 @@ void Test::testFdo65632()
 CPPUNIT_ASSERT_EQUAL(OUString("Text"), 
getProperty(getRun(getParagraphOfText(1, xText), 1), 
"TextPortionType"));
 }
 
+void Test::testN816593()
+{
+// Two consecutive  without any paragraph in between, but with 
different tblpPr. In this
+// case we need to have 2 different tables instead of 1
+uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
+uno::Reference 
xTables(xTablesSupplier->getTextTables( ), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xTables->getCount());
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(Test);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/writerfilter/inc/resourcemodel/TableData.hxx 
b/writerfilter/inc/resourcemodel/TableData.hxx
index 61efa41..7c9f9dc 100644
--- a/writerfilter/inc/resourcemodel/TableData.hxx
+++ b/writerfilter/inc/resourcemodel/TableData.hxx
@@ -409,6 +409,11 @@ public:
 {
 return mRows[i];
 }
+
+const RowPointer_t getCurrentRow() const
+{
+return mpRow;
+}
 };
 
 }
diff --git a/writerfilter/inc/resourcemodel/TableManager.hxx 
b/writerfilter/inc/resourcemodel/TableManager.hxx
index a8ee39b..72841ff 100644
--- a/writerfilter/inc/resourcemodel/TableManager.hxx
+++ b/writerfilter/inc/resourcemodel/TableManager.hxx
@@ -408,6 +408,8 @@ private:
for each level of nested tables there is one frame in the stack
  */
 stack::Pointer_t > 
mTableDataStack;
+typename RowData::Pointer_t mpUnfinishedRow;
+bool mbKeepUnfinishedRow;
 
 typedef typename TableDataHandler::Pointer_t 
TableDataHandlerPointer_t;
 
@@ -486,6 +488,14 @@ protected:
  */
 virtual void clearData();
 
+/** Should we keep the unfinished row in endLevel to initialize the table
+data in the following startLevel.
+  */
+void setKeepUnfinishedRow(bool bKeep)
+{
+mbKeepUnfinishedRow = bKeep;
+}
+
 
 public:
 TableManager();
@@ -618,7 +628,7 @@ public:
 
 template 
 TableManager::TableManager()
-: mnTableDepthNew(0), mnTableDepth(0)
+: mnTableDepthNew(0), mnTableDepth(0), mbKeepUnfinishedRow( fal

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

[Caolán McNamara]

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

New commits:
commit ce7aeaa358dcdbcaf43c55670345fad8ee86
Author: Caolán McNamara 
Date:   Tue Sep 3 12:24:34 2013 +0100

Resolves: rhbz#993963 NULL m_pWindow on firefox deleted plugin

Change-Id: Idb12b12e4313668bf3390a97551c688ee0dcde67
(cherry picked from commit 4a4ed52e57b540167c3ca45e6e762b9e21e874de)
Reviewed-on: https://gerrit.libreoffice.org/5773
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx 
b/vcl/unx/gtk/window/gtksalframe.cxx
index 0f53e93..fef8407 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2698,7 +2698,7 @@ void GtkSalFrame::SetParent( SalFrame* pNewParent )
 
 void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, 
SalX11Screen nXScreen )
 {
-bool bWasVisible = IS_WIDGET_MAPPED(m_pWindow);
+bool bWasVisible = m_pWindow ? IS_WIDGET_MAPPED(m_pWindow) : false;
 if( bWasVisible )
 Show( sal_False );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - vcl/unx

[Caolán McNamara]

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

New commits:
commit 85049f0986dbfd277dd449b908d126065c92b7d3
Author: Caolán McNamara 
Date:   Tue Sep 3 12:24:34 2013 +0100

Resolves: rhbz#993963 NULL m_pWindow on firefox deleted plugin

(cherry picked from commit 4a4ed52e57b540167c3ca45e6e762b9e21e874de)

Conflicts:
vcl/unx/gtk/window/gtksalframe.cxx

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

diff --git a/vcl/unx/gtk/window/gtkframe.cxx b/vcl/unx/gtk/window/gtkframe.cxx
index fc5154b..05f7faa 100644
--- a/vcl/unx/gtk/window/gtkframe.cxx
+++ b/vcl/unx/gtk/window/gtkframe.cxx
@@ -2719,7 +2719,7 @@ void GtkSalFrame::SetParent( SalFrame* pNewParent )
 
 void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, 
SalX11Screen nXScreen )
 {
-bool bWasVisible = IS_WIDGET_MAPPED(m_pWindow);
+bool bWasVisible = m_pWindow ? IS_WIDGET_MAPPED(m_pWindow) : false;
 if( bWasVisible )
 Show( sal_False );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 avmedia/source/vlc/wrapper/SymbolLoader.hxx |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit e576b47521446002a473575f2051ec36c4237bf2
Author: Tor Lillqvist 
Date:   Tue Sep 3 15:17:46 2013 +0300

Blind fix to make this perhaps actually work

Change-Id: If99b8f1bf55fe9acd12b9668bf8e8e4386aa44e7

diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx 
b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index cfc8653..8f70dab 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -45,10 +45,14 @@ namespace
 if ( ::RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"Software\\VideoLAN\\VLC",
  0, KEY_READ, &hKey ) == ERROR_SUCCESS )
 {
-if ( ::RegQueryValueExW( hKey, L"InstallDir", NULL, &dwType, 
(LPBYTE) arCurrent, &dwCurrentSize ) == ERROR_SUCCESS )
+if ( ::RegQueryValueExW( hKey, L"InstallDir", NULL, &dwType, 
(LPBYTE) arCurrent, &dwCurrentSize ) == ERROR_SUCCESS &&
+ dwType == REG_SZ )
 {
 ::RegCloseKey( hKey );
-return OUString( arCurrent, wcslen(arCurrent) ) + "/";
+// The value might be 0-terminated or not
+if (arCurrent[dwCurrentSize/2] == 0)
+dwCurrentSize -= 2;
+return OUString( arCurrent, dwCurrentSize ) + "/";
 }
 
 ::RegCloseKey( hKey );
commit f50f10ed74975da793cbabef1a96078989fe7bd9
Author: Tor Lillqvist 
Date:   Tue Sep 3 15:06:47 2013 +0300

Just use the wide char API and no TCHAR crack, puh-lease

Change-Id: I12dc2d9d1c76e43d27b6aaf2ded6444a6aa3d365

diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx 
b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index bf75ac5..cfc8653 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -10,7 +10,6 @@
 #ifndef _SYMBOL_LOADER_HXX
 #define _SYMBOL_LOADER_HXX
 #if defined( WNT )
-# include 
 # include 
 # include 
 #endif
@@ -40,16 +39,16 @@ namespace
 OUString GetVLCPath()
 {
 HKEY hKey;
-TCHAR arCurrent[MAX_PATH];
+wchar_t arCurrent[MAX_PATH];
 DWORD dwType, dwCurrentSize = sizeof( arCurrent );
 
-if ( ::RegOpenKeyEx( HKEY_LOCAL_MACHINE, _T( "Software\\VideoLAN\\VLC" 
),
+if ( ::RegOpenKeyExW( HKEY_LOCAL_MACHINE, L"Software\\VideoLAN\\VLC",
  0, KEY_READ, &hKey ) == ERROR_SUCCESS )
 {
-if ( ::RegQueryValueEx( hKey, _T( "InstallDir" ), NULL, &dwType, ( 
LPBYTE )arCurrent, &dwCurrentSize ) == ERROR_SUCCESS )
+if ( ::RegQueryValueExW( hKey, L"InstallDir", NULL, &dwType, 
(LPBYTE) arCurrent, &dwCurrentSize ) == ERROR_SUCCESS )
 {
 ::RegCloseKey( hKey );
-return OUString( arCurrent, strlen(arCurrent), 
RTL_TEXTENCODING_UTF8 ) + "/";
+return OUString( arCurrent, wcslen(arCurrent) ) + "/";
 }
 
 ::RegCloseKey( hKey );
@@ -58,7 +57,6 @@ namespace
 }
 #endif
 
-
 template
 bool tryLink( oslModule &aModule, const ApiMap ( &pMap )[N] )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: is there a portable version of libre office for win 7 ?

[Christian Lohmaier]

Hi *,

On Sat, Aug 31, 2013 at 5:01 AM, Supiramani Supiramani
 wrote:
> [...]
> i am interested in libre office and would like to know IF there is a
> portable version

There is  - http://www.libreoffice.org/download (see the are below the
main download buttons) - portable version is available few days after
release of the regular version

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

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

[Marcos Paulo de Souza]

 starmath/source/edit.cxx |   24 ++--
 1 file changed, 22 insertions(+), 2 deletions(-)

New commits:
commit 9e9693b91acb747cf53f819099a78f7ed4de9f40
Author: Marcos Paulo de Souza 
Date:   Tue Sep 3 09:09:19 2013 -0300

fdo#68877: Select "" as Elements window do

Elements Dock needs to have the same behavior of Elements window. After 
insert some symbol, if
this symbol have some placeholder, select the first placehold to user put 
some data.

This increases usability of Elements Dock.

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

diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index 5ccdd75..ce3dd4b 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -1025,11 +1025,31 @@ void SmEditWindow::InsertText(const OUString& rText)
 
 nEndIndex += aSelection.nEndPos;
 
+// TODO: unify this function with the InsertCommand: The do the same 
thing for different
+// callers
+OUString string(rText);
+
 // put a space before a new command if not in the beginning of a line
 if (aSelection.nStartPos > 0 && aCurrentFormula[nStartIndex - 1] != ' 
')
-pEditView->InsertText(" " + rText);
+string = " " + string;
+
+pEditView->InsertText(string);
+
+// Remember start of the selection and move the cursor there 
afterwards.
+aSelection.nEndPara = aSelection.nStartPara;
+if (HasMark(string))
+{
+aSelection.nEndPos = aSelection.nStartPos;
+pEditView->SetSelection(aSelection);
+SelNextMark();
+}
 else
-pEditView->InsertText(rText);
+{   // set selection after inserted text
+aSelection.nEndPos = aSelection.nStartPos + string.getLength();
+aSelection.nStartPos = aSelection.nEndPos;
+pEditView->SetSelection(aSelection);
+}
+
 aModifyTimer.Start();
 StartCursorMove();
 GrabFocus();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - i18nlangtag/Library_i18nlangtag.mk i18nlangtag/source

[Eike Rathke]

 i18nlangtag/Library_i18nlangtag.mk |1 
 i18nlangtag/source/languagetag/languagetag.cxx |   91 +
 2 files changed, 64 insertions(+), 28 deletions(-)

New commits:
commit 7c032aa60eaccde88a9064a80bb69fe8076a040b
Author: Eike Rathke 
Date:   Tue Sep 3 14:17:54 2013 +0200

resolve all known fallbacks

Needed for rsc during build time to not pull in liblangtag and its data.

Change-Id: I1d4dd32b04ed93ec75720132a30b66ef63fec179

diff --git a/i18nlangtag/Library_i18nlangtag.mk 
b/i18nlangtag/Library_i18nlangtag.mk
index fd1548b..30b6e01 100644
--- a/i18nlangtag/Library_i18nlangtag.mk
+++ b/i18nlangtag/Library_i18nlangtag.mk
@@ -21,6 +21,7 @@ $(eval $(call gb_Library_use_libraries,i18nlangtag,\
 ))
 
 $(eval $(call gb_Library_use_externals,i18nlangtag,\
+   boost_headers \
icu_headers \
icuuc \
 ))
diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 65236ce..de48d06 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -16,6 +16,7 @@
 #include 
 #include 
 #include 
+#include 
 
 //#define erDEBUG
 
@@ -46,13 +47,44 @@ struct myLtError
 ~myLtError() { if (p) lt_error_unref( p); }
 };
 
-
 // "statics" to be returned as const reference to an empty locale and string.
 namespace {
 struct theEmptyLocale : public rtl::Static< lang::Locale, theEmptyLocale > {};
 struct theEmptyBcp47 : public rtl::Static< OUString, theEmptyBcp47 > {};
 }
 
+typedef ::boost::unordered_set< OUString, OUStringHash > KnownTagSet;
+namespace {
+struct theKnowns : public rtl::Static< KnownTagSet, theKnowns > {};
+struct theMutex : public rtl::Static< osl::Mutex, theMutex > {};
+}
+
+static const KnownTagSet & getKnowns()
+{
+KnownTagSet & rKnowns = theKnowns::get();
+if (rKnowns.empty())
+{
+osl::MutexGuard aGuard( theMutex::get());
+if (rKnowns.empty())
+{
+::std::vector< MsLangId::LanguagetagMapping > aDefined( 
MsLangId::getDefinedLanguagetags());
+for (::std::vector< MsLangId::LanguagetagMapping >::const_iterator 
it( aDefined.begin());
+it != aDefined.end(); ++it)
+{
+// Do not use the BCP47 string here to initialize the
+// LanguageTag because then canonicalize() would call this
+// getKnowns() again..
+::std::vector< OUString > aFallbacks( LanguageTag( 
(*it).mnLang).getFallbackStrings());
+for (::std::vector< OUString >::const_iterator fb( 
aFallbacks.begin()); fb != aFallbacks.end(); ++fb)
+{
+rKnowns.insert( *fb);
+}
+}
+}
+}
+return rKnowns;
+}
+
 
 /** A reference holder for liblangtag data de/initialization, one static
 instance. Currently implemented such that the first "ref" inits and dtor
@@ -448,7 +480,7 @@ bool LanguageTag::canonicalize()
 // Now this is getting funny.. we only have some BCP47 string
 // and want to determine if parsing it would be possible
 // without using liblangtag just to see if it is a simple known
-// locale.
+// locale or could fall back to one.
 OUString aLanguage, aScript, aCountry, aVariants;
 Extraction eExt = simpleExtract( maBcp47, aLanguage, aScript, 
aCountry, aVariants);
 if (eExt != EXTRACTED_NONE)
@@ -512,6 +544,12 @@ bool LanguageTag::canonicalize()
 }
 if (mnLangID != LANGUAGE_DONTKNOW && mnLangID != 
LANGUAGE_SYSTEM)
 meIsLiblangtagNeeded = DECISION_NO; // known locale
+else
+{
+const KnownTagSet& rKnowns = getKnowns();
+if (rKnowns.find( maBcp47) != rKnowns.end())
+meIsLiblangtagNeeded = DECISION_NO; // known fallback
+}
 }
 }
 if (bTemporaryLocale)
commit c318f19c492f76e3b7d557257b3706f05b6fed62
Author: Eike Rathke 
Date:   Tue Sep 3 11:31:39 2013 +0200

simplified simpleExtract() and made some cases work

Change-Id: I5d39a020a4bb6164c0d7695d2f2e43785869b345

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 22f82fe..65236ce 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -1302,9 +1302,9 @@ LanguageTag::Extraction LanguageTag::simpleExtract( const 
OUString& rBcp47,
 Extraction eRet = EXTRACTED_NONE;
 const sal_Int32 nLen = rBcp47.getLength();
 const sal_Int32 nHyph1 = rBcp47.indexOf( '-');
-const sal_Int32 nHyph2 = (nHyph1 < 0 ? -1 : rBcp47.indexOf( '-', nHyph1 + 
1));
-const sal_Int32 nHyph3 = (nHyph2 < 0 ? -1 : rBcp47.indexOf( '-', nHyph2 + 
1));

License statement

[Farago Janos]

All of my past and future contributions to LibreOffice may be licensed
under the MPL/LGPLv3+ dual license.


Best Regards,

Janos FARAGO
Andrews IT Engineering Kft.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: Project focused on adding missing functionality to LibreOffice.

[Mateusz Marzantowicz]

On 26.08.2013 23:18, Jakub Kościelak wrote:
> 
> - Maintaining full compatibility with the file formats created in
> Microsoft Excel 2003, 2007 and 2010, including the correct application
> of special functions and macros - a lot has already been done, macros
> are the biggest problem.

How? Microsoft failed to maintain compatibility between next versions of
MS Office and you say you're gonna do it with LO? I'm facing
incompatibilities each day opening doc/docx documents on different
versions of MS Office not to mention LO.

Macros are not the biggest problem when simple two page document isn't
presented similarly on one system.


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

is there a portable version of libre office for win 7 ?

[Supiramani Supiramani]

Hi
i use a win 7 machine that has admin restriction ...i.e, installing software is 
prohibited, but i am allowed to use pportable versions 
i am interested in libre office and would like to know IF there is a portable 
version
thanks
regards

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

Re: FW: Smart-Art in Writer - Correct 'Import' approach ?

[Adam Fyne]

Hi Miklos,
See my comments below.
Thanks,
Adam


On Tue, Sep 3, 2013 at 3:21 PM, Miklos Vajna  wrote:

> Hi Adam,
>
> On Sun, Sep 01, 2013 at 05:35:12PM +0300, Adam Fyne 
> wrote:
> > We are doing some work on implementing 'Smart-Art *Preservation*' in
> Writer.
> >
> > Meaning – if the user doesWordèLOèWordround-trip we plan that
> they
> > won't lose their Smart-Art object.
> >
> > Currently Smart-Art is being imported into *simple shapes* in Writer
> (which
> > don't exactly look the same), and most of the actual data and binding
> > between shapes is lost (not to mention it doesn't look the same).
> >
> > In order to preserve the original Smart-Art object – we would plan on
> > loading the entire XML nodes and attributes of Smart-Art to property maps
> > (e.g. Miklos's great 'InteropGrabBag').
>
> This makes sense, yes.
>
> > In addition, instead of showing to the user simple shapes (that he can
> > currently edit and move around) –
> >
> > we would like to change this and show the user a *locked* bitmap of the
> > smart-art, that the user cannot manipulate (so that he can at least
> > preserve the original Smart-Art).
>
> What is the benefit of this, from a user's point of view?
>

Because at this phase, we are not going to add logic to 'manipulate' the
Smart-Art object,
so if a user is allowed to changed the location of the shapes, and then
saves back the file - and opens it in Word -
he won't understand why his 'changes' to the shapes weren't persisted.
That's why we believe it is best to simply not allow any changes, because
they won't be persisted anyway.


>
> > Should we take a different approach that maybe pops a message when
> loading
> > a DOCX with Smart-Art asking the user:
> >
> > *"We noticed you are importing a DOCX with Smart-Art. Would you like to
> > preserve it and keep it un-editable or convert it to simple shapes ?"*
> >
> > And then act according to the user's choice? (choosing simple shapes will
> > lose the 'Smart-Art' functionality, while choosing 'preserve' will not
> let
> > the user edit the smart-art, only see it).
>
> This is certainly possible, e.g. the ASCII filter asks for encoding
> IIRC, the CSV import filter is also interactive, but one popup for every
> smartart is probably a bit too much, imagine a presentation containing
> 100 smartart shapes. :)
>
The idea was to show a single pop-up for 'all Smart-Art' objects in the
file - asking
"do you want to convert the Smart-Art in this file to simple shapes (and
lose functionallity) or preserve the original Smart-Art objects ?"


>
> Miklos
>



-- 

[image: appicon.png]


*Adam Fyne*

Twitter  |
LinkedIn
 | Facebook  |
Blog
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: FW: Smart-Art in Writer - Correct 'Import' approach ?

[Miklos Vajna]

Hi Adam,

On Sun, Sep 01, 2013 at 05:35:12PM +0300, Adam Fyne  
wrote:
> We are doing some work on implementing 'Smart-Art *Preservation*' in Writer.
> 
> Meaning – if the user doesWordèLOèWordround-trip we plan that they
> won't lose their Smart-Art object.
> 
> Currently Smart-Art is being imported into *simple shapes* in Writer (which
> don't exactly look the same), and most of the actual data and binding
> between shapes is lost (not to mention it doesn't look the same).
> 
> In order to preserve the original Smart-Art object – we would plan on
> loading the entire XML nodes and attributes of Smart-Art to property maps
> (e.g. Miklos's great 'InteropGrabBag').

This makes sense, yes.

> In addition, instead of showing to the user simple shapes (that he can
> currently edit and move around) –
> 
> we would like to change this and show the user a *locked* bitmap of the
> smart-art, that the user cannot manipulate (so that he can at least
> preserve the original Smart-Art).

What is the benefit of this, from a user's point of view?

> Should we take a different approach that maybe pops a message when loading
> a DOCX with Smart-Art asking the user:
> 
> *"We noticed you are importing a DOCX with Smart-Art. Would you like to
> preserve it and keep it un-editable or convert it to simple shapes ?"*
> 
> And then act according to the user's choice? (choosing simple shapes will
> lose the 'Smart-Art' functionality, while choosing 'preserve' will not let
> the user edit the smart-art, only see it).

This is certainly possible, e.g. the ASCII filter asks for encoding
IIRC, the CSV import filter is also interactive, but one popup for every
smartart is probably a bit too much, imagine a presentation containing
100 smartart shapes. :)

Miklos


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

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

[Stephan Bergmann]

 sfx2/source/control/thumbnailview.cxx |   17 -
 1 file changed, 8 insertions(+), 9 deletions(-)

New commits:
commit 9eefaa56e4bf7d17956e1358e227573dad6a931c
Author: Stephan Bergmann 
Date:   Tue Sep 3 14:21:03 2013 +0200

warning C4701: potentially uninitialized local variable 'pItem' used

Change-Id: I04cc1589139841f50fcaa5ef9e1deaf53fb00096

diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 18d14a1..6089507 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -89,22 +89,21 @@ void ThumbnailView::MouseMove( const MouseEvent& rMEvt )
 return;
 
 (void) rMEvt; // unused parameter
-ThumbnailViewItem *pItem;
 size_t  nItemCount = mFilteredItemList.size();
-boolbFound = false;
 Point   aPoint = GetPointerState().maPos;
+OUStringaHelp;
 
-for ( size_t i = 0; i < nItemCount && !bFound; i++ )
+for ( size_t i = 0; i < nItemCount; i++ )
 {
-pItem = mFilteredItemList[i];
+ThumbnailViewItem *pItem = mFilteredItemList[i];
 if ( pItem->mbVisible && pItem->getDrawArea().IsInside(aPoint) )
-bFound = true;
+{
+aHelp = pItem->maTitle;
+break;
+}
 }
 
-if ( bFound )
-SetQuickHelpText(pItem->maTitle);
-else
-SetQuickHelpText("");
+SetQuickHelpText(aHelp);
 }
 
 void ThumbnailView::AppendItem(ThumbnailViewItem *pItem)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] add cgit/gitweb URLs

[David Tardon (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/5779

Approvals:
  David Tardon: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/5779
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9ad2904ab48d836a8ee26e512d2db97a0f6304cf
Gerrit-PatchSet: 2
Gerrit-Project: libvisio
Gerrit-Branch: master
Gerrit-Owner: David Tardon 
Gerrit-Reviewer: David Tardon 

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

[PATCH] add cgit/gitweb URLs

[David Tardon (via Code Review)]

Hi,

I would like you to review the following patch:

https://gerrit.libreoffice.org/5779

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/libvisio refs/changes/79/5779/1

add cgit/gitweb URLs

Change-Id: I9ad2904ab48d836a8ee26e512d2db97a0f6304cf
---
M README
1 file changed, 4 insertions(+), 3 deletions(-)



diff --git a/README b/README
index e8971e6..aa58d73 100644
--- a/README
+++ b/README
@@ -2,9 +2,10 @@
 
 libvisio requires boost, gperf, icu, libwpd, libwpg, libxml2, perl and
 zlib to build. Most up to date code is available from Git repository at
-libreoffice.org or the mirror at freedesktop.org and is currently
-recommended instead of regular releases. Please visit
-http://cgit.freedesktop.org/libreoffice/libvisio/. See
+libreoffice.org (https://gerrit.libreoffice.org/gitweb?p=libvisio.git)
+or the mirror at freedesktop.org
+(http://cgit.freedesktop.org/libreoffice/contrib/libvisio/) and is
+currently recommended instead of regular releases. See
 http://www.freedesktop.org/wiki/Software/libvisio for more information.
 
 For convenience of use in third-party projects the library is available under

-- 
To view, visit https://gerrit.libreoffice.org/5779
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9ad2904ab48d836a8ee26e512d2db97a0f6304cf
Gerrit-PatchSet: 1
Gerrit-Project: libvisio
Gerrit-Branch: master
Gerrit-Owner: David Tardon 

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

[Libreoffice-commits] libvisio.git: README

[David Tardon]

 README |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 21021e51b97eba53308e504ce6b6b5e23b40cf08
Author: David Tardon 
Date:   Tue Sep 3 14:07:51 2013 +0200

add cgit/gitweb URLs

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

diff --git a/README b/README
index e8971e6..aa58d73 100644
--- a/README
+++ b/README
@@ -2,9 +2,10 @@ libvisio is a library and a set of tools for reading and 
converting MS Visio dia
 
 libvisio requires boost, gperf, icu, libwpd, libwpg, libxml2, perl and
 zlib to build. Most up to date code is available from Git repository at
-libreoffice.org or the mirror at freedesktop.org and is currently
-recommended instead of regular releases. Please visit
-http://cgit.freedesktop.org/libreoffice/libvisio/. See
+libreoffice.org (https://gerrit.libreoffice.org/gitweb?p=libvisio.git)
+or the mirror at freedesktop.org
+(http://cgit.freedesktop.org/libreoffice/contrib/libvisio/) and is
+currently recommended instead of regular releases. See
 http://www.freedesktop.org/wiki/Software/libvisio for more information.
 
 For convenience of use in third-party projects the library is available under
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libvisio.git: .gitreview

[David Tardon]

 .gitreview |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 5ab187ae8db28edc323775ce6987713953722a09
Author: David Tardon 
Date:   Tue Sep 3 14:05:15 2013 +0200

set up git-review

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..f77e662
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,7 @@
+[gerrit]
+host=logerrit
+port=29418
+project=libvisio
+defaultremote=logerrit
+defaultbranch=master
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] add cgit/gitweb URLs to the repo

[David Tardon (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/5778

Approvals:
  David Tardon: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/5778
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9231c621faafdd2cc67f9b066254f0cff61f9170
Gerrit-PatchSet: 2
Gerrit-Project: libmspub
Gerrit-Branch: master
Gerrit-Owner: David Tardon 
Gerrit-Reviewer: David Tardon 

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

[Libreoffice-commits] libmspub.git: README

[David Tardon]

 README |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 0477515f72618f05e92108d619a0aeb67895dfe2
Author: David Tardon 
Date:   Tue Sep 3 14:03:03 2013 +0200

add cgit/gitweb URLs to the repo

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

diff --git a/README b/README
index 5e266b9..53b0fd8 100644
--- a/README
+++ b/README
@@ -2,10 +2,9 @@ libmspub is a library and a set of tools for reading and 
converting MS
 Publisher files.
 
 libmspub requires boost, icu, libwpd, libwpg and zlib to build. Most up
-to date code is available from Git repository at libreoffice.org or the
-mirror at freedesktop.org and is currently recommended instead of
-regular releases. Please visit
-http://cgit.freedesktop.org/libreoffice/libmspub/. See
+to date code is available from Git repository at libreoffice.org
+(https://gerrit.libreoffice.org/gitweb?p=libmspub.git) or the mirror at
+freedesktop.org (http://cgit.freedesktop.org/libreoffice/libmspub/). See
 http://www.freedesktop.org/wiki/Software/libmspub for more information.
 
 For convenience of use in third-party projects the library is available under
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PATCH] add cgit/gitweb URLs to the repo

[David Tardon (via Code Review)]

Hi,

I would like you to review the following patch:

https://gerrit.libreoffice.org/5778

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/libmspub refs/changes/78/5778/1

add cgit/gitweb URLs to the repo

Change-Id: I9231c621faafdd2cc67f9b066254f0cff61f9170
---
M README
1 file changed, 3 insertions(+), 4 deletions(-)



diff --git a/README b/README
index 5e266b9..53b0fd8 100644
--- a/README
+++ b/README
@@ -2,10 +2,9 @@
 Publisher files.
 
 libmspub requires boost, icu, libwpd, libwpg and zlib to build. Most up
-to date code is available from Git repository at libreoffice.org or the
-mirror at freedesktop.org and is currently recommended instead of
-regular releases. Please visit
-http://cgit.freedesktop.org/libreoffice/libmspub/. See
+to date code is available from Git repository at libreoffice.org
+(https://gerrit.libreoffice.org/gitweb?p=libmspub.git) or the mirror at
+freedesktop.org (http://cgit.freedesktop.org/libreoffice/libmspub/). See
 http://www.freedesktop.org/wiki/Software/libmspub for more information.
 
 For convenience of use in third-party projects the library is available under

-- 
To view, visit https://gerrit.libreoffice.org/5778
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9231c621faafdd2cc67f9b066254f0cff61f9170
Gerrit-PatchSet: 1
Gerrit-Project: libmspub
Gerrit-Branch: master
Gerrit-Owner: David Tardon 

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

[Libreoffice-commits] libmspub.git: .gitreview

[David Tardon]

 .gitreview |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 0ec56109b2df0776b8ff0c921209a58ba655541b
Author: David Tardon 
Date:   Tue Sep 3 13:59:30 2013 +0200

set up git-review

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..03ad450
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,7 @@
+[gerrit]
+host=logerrit
+port=29418
+project=libmspub
+defaultremote=logerrit
+defaultbranch=master
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/drivers/odbcbase/OResultSet.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eed831380d3fdadc7defdbe66e7a8275507ca748
Author: Lionel Elie Mamane 
Date:   Tue Aug 27 18:03:21 2013 +0200

odbc insert: adjust buffer size *after* it is written to

the buffer (aBookmark) is written to by SQLBulkOperations or
SQLSetPos, not by SQLBindCol, which merely sets up the instruction
that the next call should write there. So its finak size is known
only *after* the call that makes the write, obviously.

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

diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx 
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index eb6c328..f540f8b 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -871,7 +871,6 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, 
RuntimeException)
 &nRealLen
 );
 
-aBookmark.realloc(nRealLen);
 sal_Bool bPositionByBookmark = ( NULL != getOdbcFunction( 
ODBC3SQLBulkOperations ) );
 if ( bPositionByBookmark )
 {
@@ -885,6 +884,7 @@ void SAL_CALL OResultSet::insertRow(  ) throw(SQLException, 
RuntimeException)
 nRet = N3SQLSetPos( m_aStatementHandle, 1, SQL_ADD, SQL_LOCK_NO_CHANGE 
);
 fillNeededData( nRet );
 }
+aBookmark.realloc(nRealLen);
 try
 {
 
OTools::ThrowException(m_pStatement->getOwnConnection(),nRet,m_aStatementHandle,SQL_HANDLE_STMT,*this);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Lionel Elie Mamane]

 connectivity/source/drivers/odbcbase/OResultSet.cxx |   60 +---
 1 file changed, 39 insertions(+), 21 deletions(-)

New commits:
commit eb0aef67c76e23e77be12deda0acfb2475368fa2
Author: Lionel Elie Mamane 
Date:   Tue Aug 27 17:59:42 2013 +0200

fdo#68315 odbc update *reads* a bookmark, not *writes* a bookmark

This code was completely inverted. The row update operation
*reads* a bookmark (that is, what row to update), not *writes*
a bookmark.

So we were passing an empty bookmark, and thus the update was failing
because we were refering to a non-existent row.

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

diff --git a/connectivity/source/drivers/odbcbase/OResultSet.cxx 
b/connectivity/source/drivers/odbcbase/OResultSet.cxx
index 29c834e..eb6c328 100644
--- a/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -937,29 +937,47 @@ void SAL_CALL OResultSet::updateRow(  ) 
throw(SQLException, RuntimeException)
 
 SQLRETURN nRet;
 
-sal_Bool bPositionByBookmark = ( NULL != getOdbcFunction( 
ODBC3SQLBulkOperations ) );
-Sequence aBookmark(nMaxBookmarkLen);
-if ( bPositionByBookmark )
+try
 {
-SQLLEN nRealLen = 0;
-nRet = N3SQLBindCol(m_aStatementHandle,
-0,
-SQL_C_VARBOOKMARK,
-aBookmark.getArray(),
-aBookmark.getLength(),
-&nRealLen
-);
-fillNeededData(nRet = N3SQLBulkOperations(m_aStatementHandle, 
SQL_UPDATE_BY_BOOKMARK));
-aBookmark.realloc(nRealLen);
-m_aRow[0]=aBookmark;
-m_aRow[0].setBound(true);
+sal_Bool bPositionByBookmark = ( NULL != getOdbcFunction( 
ODBC3SQLBulkOperations ) );
+if ( bPositionByBookmark )
+{
+getBookmark();
+assert(m_aRow[0].isBound());
+Sequence aBookmark(m_aRow[0].getSequence());
+SQLLEN nRealLen = aBookmark.getLength();
+nRet = N3SQLBindCol(m_aStatementHandle,
+0,
+SQL_C_VARBOOKMARK,
+aBookmark.getArray(),
+aBookmark.getLength(),
+&nRealLen
+);
+
OTools::ThrowException(m_pStatement->getOwnConnection(),nRet,m_aStatementHandle,SQL_HANDLE_STMT,*this);
+fillNeededData(nRet = N3SQLBulkOperations(m_aStatementHandle, 
SQL_UPDATE_BY_BOOKMARK));
+// the driver should not have touched this
+// (neither the contents of aBookmark FWIW)
+assert(nRealLen == aBookmark.getLength());
+}
+else
+{
+fillNeededData(nRet = 
N3SQLSetPos(m_aStatementHandle,1,SQL_UPDATE,SQL_LOCK_NO_CHANGE));
+}
+
OTools::ThrowException(m_pStatement->getOwnConnection(),nRet,m_aStatementHandle,SQL_HANDLE_STMT,*this);
+// unbind all columns so we can fetch all columns again with SQLGetData
+// (and also so that our buffers don't clobber anything, and
+//  so that a subsequent fetch does not overwrite m_aRow[0])
+invalidateCache();
+nRet = unbind();
+OSL_ENSURE(nRet == SQL_SUCCESS,"ODBC insert could not unbind the 
columns after success");
+}
+catch(...)
+{
+// unbind all columns so that a subsequent fetch does not overwrite 
m_aRow[0]
+nRet = unbind();
+OSL_ENSURE(nRet == SQL_SUCCESS,"ODBC insert could not unbind the 
columns after failure");
+throw;
 }
-else
-fillNeededData(nRet = 
N3SQLSetPos(m_aStatementHandle,1,SQL_UPDATE,SQL_LOCK_NO_CHANGE));
-
OTools::ThrowException(m_pStatement->getOwnConnection(),nRet,m_aStatementHandle,SQL_HANDLE_STMT,*this);
-// now unbind all columns so we can fetch all columns again with SQLGetData
-nRet = unbind();
-OSL_ENSURE(nRet == SQL_SUCCESS,"Could not unbind the columns!");
 }
 // -
 void SAL_CALL OResultSet::deleteRow(  ) throw(SQLException, RuntimeException)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 60270] LibreOffice 4.1 most annoying bugs

[bugzilla-daemon]

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

tommy27  changed:

   What|Removed |Added

 Depends on|68576   |68756

--- Comment #81 from tommy27  ---
sorry, I meant Bug 68756 not 68576. I'm editing correct numbers.

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

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

[Michael Stahl]

 linguistic/source/gciterator.cxx |   12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit aa9bef8271ed50a397c959ed53c91ee44b3dcb10
Author: Michael Stahl 
Date:   Mon Sep 2 15:58:00 2013 +0200

fdo#68750: ensure that GetSuggestedEndOfSentence makes progress

Checking a string of 17399 spaces takes 20 seconds here in
GrammarCheckingIterator::GetSuggestedEndOfSentence() because
BreakIterator_Unicode::endOfSentence() will always return
0 as a result regardless of what nStartPos it gets.

Change-Id: Id02440a91d7015c2896e387854445ee5383092fa
(cherry picked from commit b23999755a865a277c29adfc1dc0c249275bfd7e)
Reviewed-on: https://gerrit.libreoffice.org/5758
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index 4c08a9e..f12b6f2 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -754,13 +754,23 @@ sal_Int32 
GrammarCheckingIterator::GetSuggestedEndOfSentence(
 m_xBreakIterator = i18n::BreakIterator::create(xContext);
 }
 sal_Int32 nTextLen = rText.getLength();
-sal_Int32 nEndPosition;
+sal_Int32 nEndPosition(0);
 sal_Int32 nTmpStartPos = nSentenceStartPos;
 do
 {
+sal_Int32 const nPrevEndPosition(nEndPosition);
 nEndPosition = nTextLen;
 if (nTmpStartPos < nTextLen)
+{
 nEndPosition = m_xBreakIterator->endOfSentence( rText, 
nTmpStartPos, rLocale );
+if (nEndPosition <= nPrevEndPosition)
+{
+// fdo#68750 if there's no progress at all then presumably
+// there's no end of sentence in this paragraph so just
+// set the end position to end of paragraph
+nEndPosition = nTextLen;
+}
+}
 if (nEndPosition < 0)
 nEndPosition = nTextLen;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 avmedia/source/vlc/vlcframegrabber.cxx  |2 +-
 avmedia/source/vlc/vlcframegrabber.hxx  |4 ++--
 avmedia/source/vlc/vlcplayer.cxx|5 +
 avmedia/source/vlc/vlcwindow.cxx|2 +-
 avmedia/source/vlc/vlcwindow.hxx|2 +-
 avmedia/source/vlc/wrapper/Player.cxx   |   12 
 avmedia/source/vlc/wrapper/SymbolLoader.hxx |6 --
 7 files changed, 26 insertions(+), 7 deletions(-)

New commits:
commit 6cb1ddb7cc351f33673d846fedef0962ac49606f
Author: Stephan Bergmann 
Date:   Tue Sep 3 13:23:40 2013 +0200

Make --enable-vlc at least compile on Windows

...no idea whether the changes are actually any good, though.

Change-Id: I43965f6c10b572ee098bfacfa0995414a53af45f

diff --git a/avmedia/source/vlc/vlcframegrabber.cxx 
b/avmedia/source/vlc/vlcframegrabber.cxx
index a90a908..6a25d39 100644
--- a/avmedia/source/vlc/vlcframegrabber.cxx
+++ b/avmedia/source/vlc/vlcframegrabber.cxx
@@ -24,7 +24,7 @@ const ::rtl::OUString AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME 
= "com.sun.star.com
 const ::rtl::OUString AVMEDIA_VLC_GRABBER_SERVICENAME = 
"com.sun.star.media.VLCFrameGrabber_VLC";
 const int MSEC_IN_SEC = 1000;
 
-SAL_CALL VLCFrameGrabber::VLCFrameGrabber( VLC::Player& player, 
boost::shared_ptr eh, const rtl::OUString& url )
+VLCFrameGrabber::VLCFrameGrabber( VLC::Player& player, 
boost::shared_ptr eh, const rtl::OUString& url )
 : FrameGrabber_BASE()
 , mPlayer( player )
 , mUrl( url )
diff --git a/avmedia/source/vlc/vlcframegrabber.hxx 
b/avmedia/source/vlc/vlcframegrabber.hxx
index afc02d0..8dc7b56 100644
--- a/avmedia/source/vlc/vlcframegrabber.hxx
+++ b/avmedia/source/vlc/vlcframegrabber.hxx
@@ -43,7 +43,7 @@ class VLCFrameGrabber : public FrameGrabber_BASE
 const rtl::OUString& mUrl;
 boost::shared_ptr mEventHandler;
 public:
-SAL_CALL VLCFrameGrabber( VLC::Player& player, 
boost::shared_ptr eh, const rtl::OUString& url );
+VLCFrameGrabber( VLC::Player& player, boost::shared_ptr 
eh, const rtl::OUString& url );
 
 ::com::sun::star::uno::Reference< css::graphic::XGraphic > SAL_CALL 
grabFrame( double fMediaTime ) throw ( ::com::sun::star::uno::RuntimeException 
);
 
@@ -55,4 +55,4 @@ public:
 }
 }
 
-#endif // _VLCFRAMEGRABBER_HXX
\ No newline at end of file
+#endif // _VLCFRAMEGRABBER_HXX
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index 247b0ef..2671571 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -167,8 +167,13 @@ namespace
 if (pEnvData == NULL)
 return -1;
 
+#if defined WNT
+// Explicit converts from HWND to int
+const int id = reinterpret_cast( pEnvData->hWnd );
+#else
 // Explicit converts from long to int
 const int id = static_cast( pEnvData->aWindow );
+#endif
 
 return id;
 }
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index 9d74fc2..9306392 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -9,7 +9,7 @@ namespace vlc {
 const ::rtl::OUString AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME = 
"com.sun.star.comp.avmedia.Window_VLC";
 const ::rtl::OUString AVMEDIA_VLC_WINDOW_SERVICENAME = 
"com.sun.star.media.Window_VLC";
 
-SAL_CALL VLCWindow::VLCWindow(VLCPlayer& player)
+VLCWindow::VLCWindow(VLCPlayer& player)
 : mPlayer( player )
 {
 }
diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx
index bc0568c..17a8c88 100644
--- a/avmedia/source/vlc/vlcwindow.hxx
+++ b/avmedia/source/vlc/vlcwindow.hxx
@@ -30,7 +30,7 @@ class VLCWindow : public ::cppu::WeakImplHelper2 < 
::com::sun::star::media::XPla
 {
 VLCPlayer& mPlayer;
 public:
-SAL_CALL VLCWindow(VLCPlayer& player);
+VLCWindow(VLCPlayer& player);
 
 void SAL_CALL update() throw (css::uno::RuntimeException);
 ::sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw 
(css::uno::RuntimeException);
diff --git a/avmedia/source/vlc/wrapper/Player.cxx 
b/avmedia/source/vlc/wrapper/Player.cxx
index a36a15d..763e5c9 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -18,7 +18,11 @@ namespace VLC
 {
 namespace
 {
+#if defined WNT
+typedef __int64 libvlc_time_t;
+#else
 typedef int64_t libvlc_time_t;
+#endif
 
 void ( *libvlc_media_player_retain ) ( libvlc_media_player_t *p_mi );
 libvlc_media_player_t * ( *libvlc_media_player_new_from_media ) ( 
libvlc_media_t *p_md );
@@ -38,7 +42,11 @@ namespace VLC
 int ( *libvlc_video_take_snapshot ) ( libvlc_media_player_t *p_mi, 
unsigned num,
 const char *psz_filepath, unsigned int i_width,
 unsigned int i_height );
+#if defined WNT
+void ( *libvlc_media_player_set_hwnd ) ( libvlc_media_player_t *p_mi, 
void *drawable );
+#else
 void ( *libvlc_media_play

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

[Caolán McNamara]

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

New commits:
commit 4a4ed52e57b540167c3ca45e6e762b9e21e874de
Author: Caolán McNamara 
Date:   Tue Sep 3 12:24:34 2013 +0100

Resolves: rhbz#993963 NULL m_pWindow on firefox deleted plugin

Change-Id: Idb12b12e4313668bf3390a97551c688ee0dcde67

diff --git a/vcl/unx/gtk/window/gtksalframe.cxx 
b/vcl/unx/gtk/window/gtksalframe.cxx
index 7c4ddfb..44d894d 100644
--- a/vcl/unx/gtk/window/gtksalframe.cxx
+++ b/vcl/unx/gtk/window/gtksalframe.cxx
@@ -2842,7 +2842,7 @@ void GtkSalFrame::SetParent( SalFrame* pNewParent )
 
 void GtkSalFrame::createNewWindow( XLIB_Window aNewParent, bool bXEmbed, 
SalX11Screen nXScreen )
 {
-bool bWasVisible = IS_WIDGET_MAPPED(m_pWindow);
+bool bWasVisible = m_pWindow ? IS_WIDGET_MAPPED(m_pWindow) : false;
 if( bWasVisible )
 Show( sal_False );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 svtools/source/control/ruler.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 29875a8d05dd3200775b987f25ed6277a15104fa
Author: Tor Lillqvist 
Date:   Tue Sep 3 14:14:39 2013 +0300

WaE:  C4805: '!=' : unsafe mix of type 'bool' and type 'sal_Bool'

Change-Id: I18cefc69b963cb957645a4586079de0d448e90b3

diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index 5955d46..6aa2c6c 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2890,7 +2890,7 @@ void Ruler::DrawTab( OutputDevice* pDevice, const Color 
&rFillColor, const Point
 
 void Ruler::SetTextRTL(sal_Bool bRTL)
 {
-if(mpData->bTextRTL != bRTL)
+if(mpData->bTextRTL != (bool) bRTL)
 {
 mpData->bTextRTL = bRTL;
 if ( IsReallyVisible() && IsUpdateMode() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: README

[David Tardon]

 README |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 5e7bbd79cc6b90c7473efda605259c9613c52c41
Author: David Tardon 
Date:   Tue Sep 3 13:13:30 2013 +0200

use cgit/gitweb URLs after all

Change-Id: I62fb1a9e3e53c823c2e2a3db120220c04488b73b

diff --git a/README b/README
index 0a95f5e..ed67853 100644
--- a/README
+++ b/README
@@ -14,8 +14,8 @@ applications that have no notion of pages themselves.
 
 libcdr requires boost, icu, lcms2, libwpd, libwpg and zlib to build.
 Most up to date code is available from Git repository at libreoffice.org
-(git://gerrit.libreoffice.org/libcdr), which is mirrored at
-freedesktop.org (git://anongit.freedesktop.org/libreoffice/libcdr). See
+(https://gerrit.libreoffice.org/gitweb?p=libcdr.git), which is mirrored at
+freedesktop.org (http://cgit.freedesktop.org/libreoffice/libcdr/). See
 http://www.freedesktop.org/wiki/Software/libcdr for more information.
 
 For convenience of use in third-party projects the library is available under
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[PUSHED] update README

[David Tardon (via Code Review)]

Hi,

Thank you for your patch!  It has been merged to LibreOffice.

If you are interested in details, please visit

https://gerrit.libreoffice.org/5772

Approvals:
  David Tardon: Verified; Looks good to me, approved


-- 
To view, visit https://gerrit.libreoffice.org/5772
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I4b64948956b8819896b2ed2ee117fe747c38078f
Gerrit-PatchSet: 2
Gerrit-Project: libcdr
Gerrit-Branch: master
Gerrit-Owner: David Tardon 
Gerrit-Reviewer: David Tardon 

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

[PATCH] update README

[David Tardon (via Code Review)]

Hi,

I would like you to review the following patch:

https://gerrit.libreoffice.org/5772

To pull it, you can do:

git pull ssh://gerrit.libreoffice.org:29418/libcdr refs/changes/72/5772/1

update README

Change-Id: I4b64948956b8819896b2ed2ee117fe747c38078f
---
M README
1 file changed, 3 insertions(+), 3 deletions(-)



diff --git a/README b/README
index 0fb9aed..0a95f5e 100644
--- a/README
+++ b/README
@@ -13,9 +13,9 @@
 applications that have no notion of pages themselves.
 
 libcdr requires boost, icu, lcms2, libwpd, libwpg and zlib to build.
-Most up to date code is available from Git repository at Freedesktop and
-is currently recommended instead of regular releases. Please visit
-http://cgit.freedesktop.org/libreoffice/libcdr/. See
+Most up to date code is available from Git repository at libreoffice.org
+(git://gerrit.libreoffice.org/libcdr), which is mirrored at
+freedesktop.org (git://anongit.freedesktop.org/libreoffice/libcdr). See
 http://www.freedesktop.org/wiki/Software/libcdr for more information.
 
 For convenience of use in third-party projects the library is available under

-- 
To view, visit https://gerrit.libreoffice.org/5772
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b64948956b8819896b2ed2ee117fe747c38078f
Gerrit-PatchSet: 1
Gerrit-Project: libcdr
Gerrit-Branch: master
Gerrit-Owner: David Tardon 

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

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

[Artur Dryomov]

 sd/source/ui/remotecontrol/ImagePreparer.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 96eff63b878b53c92375e02910fcf12b8b9df923
Author: Artur Dryomov 
Date:   Tue Sep 3 12:47:20 2013 +0300

Fix HTML closing tags order for slide notes.

Change-Id: Ia6f84965ea0137c58f6bef375e14863d262f7e2b
Reviewed-on: https://gerrit.libreoffice.org/5771
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx 
b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 9dca799..112c7da 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -195,7 +195,7 @@ void ImagePreparer::sendNotes( sal_uInt32 aSlideNumber )
 
 aBuffer.append( "" );
 aBuffer.append( aNotes );
-aBuffer.append( "" );
+aBuffer.append( "" );
 aBuffer.append( "\n\n" );
 pTransmitter->addMessage( aBuffer.makeStringAndClear(),
 Transmitter::PRIORITY_LOW );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: README

[David Tardon]

 README |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e1c6373b727a3c79941d23b825538c32e49c80d9
Author: David Tardon 
Date:   Tue Sep 3 12:58:31 2013 +0200

update README

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

diff --git a/README b/README
index 0fb9aed..0a95f5e 100644
--- a/README
+++ b/README
@@ -13,9 +13,9 @@ Above that libcdr provides a public API for rendering preview 
of pages for
 applications that have no notion of pages themselves.
 
 libcdr requires boost, icu, lcms2, libwpd, libwpg and zlib to build.
-Most up to date code is available from Git repository at Freedesktop and
-is currently recommended instead of regular releases. Please visit
-http://cgit.freedesktop.org/libreoffice/libcdr/. See
+Most up to date code is available from Git repository at libreoffice.org
+(git://gerrit.libreoffice.org/libcdr), which is mirrored at
+freedesktop.org (git://anongit.freedesktop.org/libreoffice/libcdr). See
 http://www.freedesktop.org/wiki/Software/libcdr for more information.
 
 For convenience of use in third-party projects the library is available under
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] libcdr.git: .gitreview

[David Tardon]

 .gitreview |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 833fd12ef16b40d18c8bd2e0259618d4d8a2503a
Author: David Tardon 
Date:   Tue Sep 3 13:02:37 2013 +0200

simplify use of git-review for libcdr

Change-Id: I6570dcfe3992706b07ee042ea60eafd991e5d8f9

diff --git a/.gitreview b/.gitreview
new file mode 100644
index 000..ceb2d91
--- /dev/null
+++ b/.gitreview
@@ -0,0 +1,7 @@
+[gerrit]
+host=logerrit
+port=29418
+project=libcdr
+defaultremote=logerrit
+defaultbranch=master
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 basic/source/comp/dim.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 17fb3ac805acbaf5e503d44ac96d928333164f2d
Author: Tor Lillqvist 
Date:   Tue Sep 3 13:55:18 2013 +0300

WaE: C4101: 'ex' : unreferenced local variable

Change-Id: If56eaa48c176138cd1b74da2f7f0aa71e3845894

diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx
index 64d0565..4173909 100644
--- a/basic/source/comp/dim.cxx
+++ b/basic/source/comp/dim.cxx
@@ -1349,7 +1349,7 @@ bool SbiParser::IsUnoInterface(const OUString& sTypeName)
 }
 return false;
 }
-catch(const Exception& ex)
+catch(const Exception&)
 {
 OSL_FAIL("Could not create reflection.CoreReflection.");
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Krisztian Pinter]

 include/sfx2/thumbnailview.hxx|5 +
 sfx2/source/control/thumbnailview.cxx |   32 +++-
 sfx2/source/dialog/backingwindow.cxx  |2 ++
 3 files changed, 38 insertions(+), 1 deletion(-)

New commits:
commit 48d00430e2b1ceb16a0c377c4aa6c40b733eb529
Author: Krisztian Pinter 
Date:   Mon Sep 2 15:46:23 2013 +0200

startcenter: Add tooltips for thumbnails with long filenames

Change-Id: Id9bab881f74b40691cb3e7364af78758d769a8a6
Reviewed-on: https://gerrit.libreoffice.org/5756
Reviewed-by: Krisztian Pinter 
Tested-by: Krisztian Pinter 

diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 823e6ad..30037a6 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -186,6 +186,8 @@ public:
 
 virtual ~ThumbnailView ();
 
+virtual voidMouseMove( const MouseEvent& rMEvt );
+
 void AppendItem (ThumbnailViewItem *pItem);
 
 void RemoveItem( sal_uInt16 nItemId );
@@ -230,6 +232,8 @@ public:
 
 OUString GetItemText( sal_uInt16 nItemId ) const;
 
+void ShowTooltips( bool bShowTooltips );
+
 void SetColor( const Color& rColor );
 
 void SetColor() { SetColor( Color( COL_TRANSPARENT ) ); }
@@ -328,6 +332,7 @@ protected:
 bool mbScroll : 1;
 bool mbIsTransientChildrenDisabled : 1;
 bool mbHasVisibleItems : 1;
+bool mbShowTooltips : 1;
 Color maColor;
 
 Link maItemStateHdl;
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index b80086b..18d14a1 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -83,6 +83,30 @@ ThumbnailView::~ThumbnailView()
 ImplDeleteItems();
 }
 
+void ThumbnailView::MouseMove( const MouseEvent& rMEvt )
+{
+if ( !mbShowTooltips )
+return;
+
+(void) rMEvt; // unused parameter
+ThumbnailViewItem *pItem;
+size_t  nItemCount = mFilteredItemList.size();
+boolbFound = false;
+Point   aPoint = GetPointerState().maPos;
+
+for ( size_t i = 0; i < nItemCount && !bFound; i++ )
+{
+pItem = mFilteredItemList[i];
+if ( pItem->mbVisible && pItem->getDrawArea().IsInside(aPoint) )
+bFound = true;
+}
+
+if ( bFound )
+SetQuickHelpText(pItem->maTitle);
+else
+SetQuickHelpText("");
+}
+
 void ThumbnailView::AppendItem(ThumbnailViewItem *pItem)
 {
 if (maFilterFunc(pItem))
@@ -110,7 +134,7 @@ void ThumbnailView::ImplInit()
 mnHeaderHeight  = 0;
 mnItemWidth = 0;
 mnItemHeight= 0;
-mnItemPadding = 0;
+mnItemPadding   = 0;
 mnVisLines  = 0;
 mnLines = 0;
 mnFirstLine = 0;
@@ -119,6 +143,7 @@ void ThumbnailView::ImplInit()
 mnSpacing   = 0;
 mbScroll= false;
 mbHasVisibleItems   = false;
+mbShowTooltips  = false;
 maFilterFunc = ViewFilterAll();
 maColor = GetSettings().GetStyleSettings().GetFieldColor();
 mpStartSelRange = mFilteredItemList.end();
@@ -1210,6 +1235,11 @@ OUString ThumbnailView::GetItemText( sal_uInt16 nItemId 
) const
 return OUString();
 }
 
+void ThumbnailView::ShowTooltips( bool bShowTooltips )
+{
+mbShowTooltips = bShowTooltips;
+}
+
 void ThumbnailView::SetColor( const Color& rColor )
 {
 maColor = rColor;
diff --git a/sfx2/source/dialog/backingwindow.cxx 
b/sfx2/source/dialog/backingwindow.cxx
index 40d04d7..e951291 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -255,6 +255,7 @@ void BackingWindow::initControls()
 // of setupModuleTab. TYPE_OTHER is always added.
 mpAllRecentThumbnails->mnFileTypes |= TYPE_OTHER;
 mpAllRecentThumbnails->loadRecentDocs();
+mpAllRecentThumbnails->ShowTooltips( true );
 
 setupButton( mpWriterButton );
 setupButton( mpDrawButton );
@@ -304,6 +305,7 @@ void BackingWindow::setupModuleTab(const OString& rTabName, 
RecentDocsView* pRec
 mpAllRecentThumbnails-> mnFileTypes |= nFileTypes;
 pRecView->mnFileTypes |= nFileTypes;
 pRecView->loadRecentDocs();
+pRecView->ShowTooltips( true );
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits