LibreOffice Gerrit News for core on 2015-03-15
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + tdf#89387 Add functor for ScAmpersand in https://gerrit.libreoffice.org/14873 from Łukasz Hryniuk about module sc + Resolves tdf#84240 : Red squiggly underline does not appear instantly in https://gerrit.libreoffice.org/14872 from Deena P. F. about module sc + tdf#88230 Dropped the recursive solar mutex. in https://gerrit.libreoffice.org/14869 from Gülşah Köse about module accessibility + fdo#84628 Created .project file generator. in https://gerrit.libreoffice.org/14871 from Gülşah Köse about module bin + tdf#88230: add a clear() method to SolarMutexReleaser in https://gerrit.libreoffice.org/14867 from Pranav Kant about module include + tdf#88230: cleanup solar mutex yielding in https://gerrit.libreoffice.org/14868 from Pranav Kant about module accessibility, basctl, cui, desktop, editeng, extensions, fpicker, framework, starmath, svtools, sw, uui, vcl + tdf#80758:empty values in button name not respected in https://gerrit.libreoffice.org/14498 from Rishabh Kumar about module cui + tdf#81073 :Addition of text zoom levels to print preview zoom in https://gerrit.libreoffice.org/14488 from Rishabh Kumar about module include, svx, sw End of freshness + use std::unique_ptr for Sm*Dialog in https://gerrit.libreoffice.org/14874 from Takeshi Abe about module starmath + tdf#39468 Translate German Comments - sc/source/core/data/ in https://gerrit.libreoffice.org/14866 from Christian M. Heller about module sc + tdf#89361 Remove remnants of Gopher support in https://gerrit.libreoffice.org/14471 from Adolfo Jayme Barrientos about module external, include, sal, svtools * Merged changes on master for project core changed in the last 25 hours: + Related to tdf#89387 remove unused stuff in https://gerrit.libreoffice.org/14861 from Łukasz Hryniuk + tdf#89482 fix __refheading__ regression, set only CrossRefs as TOC. in https://gerrit.libreoffice.org/14822 from Justin Luth + tdf#43157: Enable format check in sal_detail_logFormat in https://gerrit.libreoffice.org/14857 from Stephan Bergmann * Abandoned changes on master for project core changed in the last 25 hours: + tdf#88230: cleanup solar mutex yielding in https://gerrit.libreoffice.org/14858 from Pranav Kant * Open changes needing tweaks, but being untouched for more than a week: + SkipImages option for document import in https://gerrit.libreoffice.org/14733 from Németh László + fdo#83672 , fdo#67776 : Fixed shape rotation angle in xlsx import. in https://gerrit.libreoffice.org/13090 from Sushil Shinde + tdf#85491 : break parameter incorrectly set in .XLSX import. in https://gerrit.libreoffice.org/12213 from Sushil Shinde + more breeze icons in https://gerrit.libreoffice.org/13058 from Jonathan Riddell + fdo#86606 removal of direct formatting options from the context menu in https://gerrit.libreoffice.org/13196 from Yousuf Philips + fdo#87441-Sending document as Email removes invisible content - this shou in https://gerrit.libreoffice.org/14549 from Charu Tyagi + Drop MAC_OS_X_VERSION_... variables in https://gerrit.libreoffice.org/13212 from Douglas Mencken + fdo#63905: fix regression by using paper size set in printer properties in https://gerrit.libreoffice.org/13763 from Clément Lassieur + jpeg-turbo: OpenCL for decompression of jpegs. in https://gerrit.libreoffice.org/13315 from Jan Holesovsky + GPU Calc:Support string parameter in SUMIF an SUMIFS. in https://gerrit.libreoffice.org/12044 from Hao Chen + vcl: Reduce OpenGLX11CairoTextRender surface area to size of text bounds in https://gerrit.libreoffice.org/14148 from Chris Sherlock + wip: get rid of svx dbtoolsclient in https://gerrit.libreoffice.org/11737 from Lionel Elie Mamane + Fix typo code Persistant in https://gerrit.libreoffice.org/14030 from Andrea Gelmini + fdo#88309: Standardize, cleanup, and improve Assertions in https://gerrit.libreoffice.org/13945 from Ashod Nakashian + --with-macosx-app-name= is unused, so bin it from AC_ARG_WITH list in https://gerrit.libreoffice.org/13658 from Douglas Mencken + fdo#75825-"Send Document as E-Mail" not working in https://gerrit.libreoffice.org/13786 from Charu Tyagi + solenv-filelists.pm: fix "can't call method `mode' on an undefined value" in https://gerrit.libreoffice.org/13669 from Douglas Mencken + gbuild-to-ide fixes in https://gerrit.libreoffice.org/11754 from Peter Foley + fdo#82335. in https://gerrit.libreoffice.org/11555 from Sudarshan Rao + fdo#39625 Make existing CppUnittests work in https://gerrit.libreoffice.org/11605 from Tobias Madl + fdo#86784 make soffice commandline in juh Bootstrap.bootstrap() configura in https://gerrit.libreoffice.org/13290 from Christoph Lutz + start detection of kf5 stuff in configure.ac in https://gerrit.libreoffice.org/13079 from Jonathan Riddell Best, Your friendly LibreOff
Re: Load files into Writer only?
I've done some digging around, and I've figured out how to spawn a
Writer instance. But then I get stuck when I try to load the document.
There's more code here:
https://forum.openoffice.org/en/forum/viewtopic.php?f=25&t=75608#p345563
Any help with this would be greatly appreciated :-)
Thanks!
On Thu, Mar 05, 2015 at 05:53:35AM +0100, Jens Tröger wrote:
> One way of approaching the problem below is by checking the file type of
> the document, before handing it off to the soffice instance. Checking
> the extension only might be too flimsy, perhaps libmagic can help?
>
> There is a list of supported file formats here:
>
> http://en.wikipedia.org/wiki/LibreOffice#Supported_file_formats
>
> but it seems rather tedious to me to check manually for Writer document
> files. Is there a better way?
>
> Cheers.
>
>
> On Thu, Feb 26, 2015 at 05:36:18PM +0100, Jens Tröger wrote:
> > Hi,
> >
> > Is there a way to load Writer supported documents only, and dismiss
> > (fail) on others? For example, I connect to an office server like so
> >
> > local = uno.getComponentContext()
> > resolver =
> > local.ServiceManager.createInstanceWithContext("com.sun.star.bridge.UnoUrlResolver",
> > local)
> > context =
> > resolver.resolve("uno:pipe,name=foopipe;urp;StarOffice.ComponentContext")
> > desktop =
> > context.ServiceManager.createInstanceWithContext("com.sun.star.frame.Desktop",
> > context)
> >
> > Now I'd like to
> >
> > desktop.loadComponentFromURL()
> >
> > and if that file is e.g. and image that Writer can not open, then fail.
> > Same for any other file which is not a Writer supported file. I've
> > looked at this call
> >
> >
> > http://www.openoffice.org/api/docs/common/ref/com/sun/star/lang/XMultiComponentFactory.html#createInstanceWithArgumentsAndContext
> >
> > but can't figure out if that's the right way to go. Or should I check
> > if the file is of a certain type before I pass it on to office? In that
> > case though, I might reject some funky format which Writer supports,
> > just because I didn't know about it.
> >
> > Thanks!
> > Jens
>
--
Jens Tröger
http://savage.light-speed.de/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2015-15-03_02:33:29 with user buildslave at host vm138 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
CppCheck Report Update
A new cppcheck report is available at : http://dev-builds.libreoffice.org/cppcheck_reports/master/ Note: The script generating this report was run at : 2015-15-03_02:19:04 with user buildslave at host vm140 as /home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s /home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w /home/buildslave/tmp/www It can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=cppcheck/cppcheck-report.sh ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Office Application BoF @ OSTC, Beijing 2015/3/28
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Well, what about open source office suites in Taiwan? Franklin On 03/13/2015 03:48 PM, imacat wrote: > Dear all, > > Is there anybody that will attend to OSTC 2015, Beijing at the end > of this month (3/28)? > > I would like to call for a BoF on Office Application at the noon of > OSTC. We may have some talks and know each other, and have some small > discussion about the development of LibreOffice / OpenOffice in the > future. Ross Gardler, one of the board of directors of ASF, will join > us in the event. And we are still asking for more guests, maybe from MS > OOXML. So if you are interested in the development of LibreOffice / > OpenOffice, or simply want to know more friends in the community, please > come join us! > > Please reply and let us know if you are going to join us. Because > the current venue is quite small, we might have to seek for a larger > venue. ^_^ > > > > ___ > LibreOffice mailing list > LibreOffice@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/libreoffice - -- Skype: touch21st, Gtalk: touch21st, Yahoo/MSN:franklinwan...@yahoo.com Xing/Linkedin: Franklin Wang -BEGIN PGP SIGNATURE- Version: GnuPG v2 iF4EAREIAAYFAlUE3bAACgkQHNPJJKP5NjaWPwD+O8tykqwPctY3npuBM63nbtDc UP1ygVPh2HF2syIEMFUA/1uY6/TESC4/1gIMUz8ImDsqBYtbzO2AsPMYz2IR/xKr =5EbS -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'feature/vclref' - include/toolkit svtools/source toolkit/source
include/toolkit/awt/vclxaccessiblecomponent.hxx|4
include/toolkit/awt/vclxdevice.hxx |2
include/toolkit/awt/vclxwindow.hxx |2
svtools/source/control/vclxaccessibleheaderbar.cxx |3
svtools/source/inc/unoiface.hxx|9
svtools/source/toolpanel/toolpaneldrawerpeer.cxx |2
svtools/source/uno/popupwindowcontroller.cxx |2
svtools/source/uno/statusbarcontroller.cxx |2
svtools/source/uno/svtxgridcontrol.cxx | 58 ++---
svtools/source/uno/svtxgridcontrol.hxx |2
svtools/source/uno/toolboxcontroller.cxx |2
svtools/source/uno/treecontrolpeer.cxx |2
svtools/source/uno/treecontrolpeer.hxx |2
svtools/source/uno/unoiface.cxx| 205 ++---
toolkit/source/awt/vclxwindow.cxx |2
15 files changed, 146 insertions(+), 153 deletions(-)
New commits:
commit ea2054c1ba66a01474f478dd1d702c97f384beee
Author: Michael Meeks
Date: Sat Mar 14 23:48:14 2015 +
svtools: switch UNO pieces to use VclPtr enabled toolkit.
Change-Id: Ib243b14e3476d3a65ad1414e3843511420201c7c
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx
b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index dd72bd2..85509b4 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -85,6 +85,10 @@ public:
VCLXWindow*GetVCLXWindow() const { return mpVCLXindow; }
VclPtr GetWindow() const;
+template< class derived_type > VclPtr< derived_type > GetAs() const {
+return VclPtr< derived_type >( static_cast< derived_type * >(
GetWindow().get() ) ); }
+template< class derived_type > VclPtr< derived_type > GetAsDynamic() const
{
+return VclPtr< derived_type >( dynamic_cast< derived_type * >(
GetWindow().get() ) ); }
virtual void SAL_CALL disposing() SAL_OVERRIDE;
diff --git a/include/toolkit/awt/vclxdevice.hxx
b/include/toolkit/awt/vclxdevice.hxx
index 751ffd8..47a99ea 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -59,7 +59,7 @@ public:
VCLXDevice();
virtual ~VCLXDevice();
-voidSetOutputDevice( VclPtr pOutDev ) {
mpOutputDevice = pOutDev; }
+voidSetOutputDevice( const VclPtr
&pOutDev ) { mpOutputDevice = pOutDev; }
VclPtrGetOutputDevice() const { return mpOutputDevice; }
voidSetCreatedWithToolkit( bool bCreatedWithToolkit );
diff --git a/include/toolkit/awt/vclxwindow.hxx
b/include/toolkit/awt/vclxwindow.hxx
index dfc42aa..1ab1f9e 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -128,7 +128,7 @@ public:
VCLXWindow( bool bWithDefaultProps = false );
virtual ~VCLXWindow();
-virtual voidSetWindow( VclPtr pWindow );
+virtual void SetWindow( const VclPtr< vcl::Window > &pWindow );
template< class derived_type > VclPtr< derived_type > GetAs() const {
return VclPtr< derived_type >( static_cast< derived_type * >(
GetOutputDevice().get() ) ); }
template< class derived_type > VclPtr< derived_type > GetAsDynamic() const
{
diff --git a/svtools/source/control/vclxaccessibleheaderbar.cxx
b/svtools/source/control/vclxaccessibleheaderbar.cxx
index 19a1e55..7c92837 100644
--- a/svtools/source/control/vclxaccessibleheaderbar.cxx
+++ b/svtools/source/control/vclxaccessibleheaderbar.cxx
@@ -56,11 +56,10 @@ VCLXAccessibleHeaderBar::VCLXAccessibleHeaderBar(
VCLXWindow* pVCLWindow )
:VCLXAccessibleComponent( pVCLWindow )
,m_pHeadBar(NULL)
{
-m_pHeadBar = static_cast< HeaderBar* >( GetWindow() );
+m_pHeadBar = GetAs< HeaderBar >();
}
-
VCLXAccessibleHeaderBar::~VCLXAccessibleHeaderBar()
{
}
diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx
index 684c964..f81a3a7 100644
--- a/svtools/source/inc/unoiface.hxx
+++ b/svtools/source/inc/unoiface.hxx
@@ -124,7 +124,7 @@ public:
VCLXFileControl();
virtual ~VCLXFileControl();
-voidSetWindow( vcl::Window* pWindow ) SAL_OVERRIDE;
+virtual void SetWindow( const VclPtr< vcl::Window > &pWindow )
SAL_OVERRIDE;
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any SAL_CALL queryInterface( const
::com::sun::star::uno::Type & rType )
throw(::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE;
@@ -176,8 +176,6 @@ protected:
sal_Int32 nKeyToSetDelayed;
-FormattedField* GetFormattedField() const { return
static_cast(GetWindow()); }
-
public:
SVTXFormattedField();
virtual ~SVTXFormattedField();
@@ -210,7 +208,7 @@ protected:
voidNotifyTextListeners();
::com
[Libreoffice-commits] core.git: Branch 'feature/vclref' - include/toolkit toolkit/source
include/toolkit/controls/accessiblecontrolcontext.hxx |3
include/toolkit/helper/vclunohelper.hxx |9 -
toolkit/source/awt/vclxwindows.cxx| 103 --
toolkit/source/controls/accessiblecontrolcontext.cxx | 11 +
toolkit/source/helper/vclunohelper.cxx| 12 +-
5 files changed, 69 insertions(+), 69 deletions(-)
New commits:
commit 9647d0c3b3d89ed35b6d7e9801c0638f2c6b688e
Author: Michael Meeks
Date: Sat Mar 14 23:15:17 2015 +
toolkit: more VclPtr pieces.
Change-Id: I0393d906657b94cc547986a2165960a85d36cf48
diff --git a/include/toolkit/controls/accessiblecontrolcontext.hxx
b/include/toolkit/controls/accessiblecontrolcontext.hxx
index 928c37b..105e2cd 100644
--- a/include/toolkit/controls/accessiblecontrolcontext.hxx
+++ b/include/toolkit/controls/accessiblecontrolcontext.hxx
@@ -26,6 +26,7 @@
#include
#include
#include
+#include
namespace vcl { class Window; }
@@ -117,7 +118,7 @@ namespace toolkit
// stops listening at the control model
void stopModelListening( );
-vcl::Window* implGetWindow( ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const;
+VclPtr< vcl::Window > implGetWindow( ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindow >* _pxUNOWindow = NULL ) const;
};
diff --git a/include/toolkit/helper/vclunohelper.hxx
b/include/toolkit/helper/vclunohelper.hxx
index e8a6c9b..5cc1d38 100644
--- a/include/toolkit/helper/vclunohelper.hxx
+++ b/include/toolkit/helper/vclunohelper.hxx
@@ -56,11 +56,12 @@ namespace com { namespace sun { namespace star { namespace
awt {
#include
#include
#include
+#include
+#include
#include
#include
#include
-namespace vcl { class Window; }
class OutputDevice;
class MouseEvent;
class KeyEvent;
@@ -79,9 +80,9 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap>
CreateBitmap( const BitmapEx& rBitmap );
// Window
-static vcl::Window*
GetWindow( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindow>& rxWindow );
-static vcl::Window*
GetWindow( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindow2>& rxWindow2 );
-static vcl::Window*
GetWindow( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindowPeer>& rxWindowPeer );
+static VclPtr< vcl::Window >
GetWindow( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindow>& rxWindow );
+static VclPtr< vcl::Window >
GetWindow( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindow2>& rxWindow2 );
+static VclPtr< vcl::Window >
GetWindow( const ::com::sun::star::uno::Reference<
::com::sun::star::awt::XWindowPeer>& rxWindowPeer );
static ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>
GetInterface( vcl::Window* pWindow );
// OutputDevice
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 51f49da..c8e320f 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -5154,7 +5154,7 @@ void VCLXTimeField::setTime( const util::Time& aTime )
throw(::com::sun::star::u
{
SolarMutexGuard aGuard;
-TimeField* pTimeField = static_cast(GetWindow());
+VclPtr< TimeField > pTimeField = GetAs< TimeField >();
if ( pTimeField )
{
pTimeField->SetTime( aTime );
@@ -5171,7 +5171,7 @@ util::Time VCLXTimeField::getTime()
throw(::com::sun::star::uno::RuntimeExceptio
{
SolarMutexGuard aGuard;
-TimeField* pTimeField = static_cast(GetWindow());
+VclPtr< TimeField > pTimeField = GetAs< TimeField >();
if ( pTimeField )
return pTimeField->GetTime().GetUNOTime();
else
@@ -5182,7 +5182,7 @@ void VCLXTimeField::setMin( const util::Time& aTime )
throw(::com::sun::star::un
{
SolarMutexGuard aGuard;
-TimeField* pTimeField = static_cast(GetWindow());
+VclPtr< TimeField > pTimeField = GetAs< TimeField >();
if ( pTimeField )
pTimeField->SetMin( aTime );
}
@@ -5191,7 +5191,7 @@ util::Time VCLXTimeField::getMin()
throw(::com::sun::star::uno::RuntimeException
{
SolarMutexGuard aGuard;
-TimeField* pTimeField = static_cast(GetWindow());
+VclPtr< TimeField > pTimeField = GetAs< TimeField >();
if ( pTimeField )
return pTimeField->GetMin().GetUNOTime();
else
@@ -5202,7 +5202,7 @@ void VCLXTimeField::setMax( const util::Time& aTime )
throw(::com::sun::star::un
{
SolarMutexGuard aGuard;
-TimeField* pTimeField =
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/scmatrix.cxx | 32 ++--
1 file changed, 14 insertions(+), 18 deletions(-)
New commits:
commit 460b17d2712a80331a83329d2951f3e0303835cd
Author: Åukasz Hryniuk
Date: Sat Mar 14 23:56:22 2015 +0100
Related to tdf#89387 remove unused stuff
Change-Id: I7c8963385874af1233a704faca1f5b173220ba37
Reviewed-on: https://gerrit.libreoffice.org/14861
Tested-by: Markus Mohrhard
Reviewed-by: Markus Mohrhard
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 5f6e155..07e90db 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -36,7 +36,6 @@
#include
#include
-#include
#include
#include
@@ -2546,20 +2545,17 @@ private:
TOp maOp;
svl::SharedString maString;
double mfVal;
-bool mbUseForEmpty;
COp maCOp;
public:
-
typedef TEmptyRes empty_value_type;
typedef TRet number_value_type;
typedef svl::SharedString string_value_type;
-MatOp(TOp op, svl::SharedString aString, double fVal=0.0, bool
bUseForEmpty=true):
-maOp(op),
+MatOp(TOp aOp, svl::SharedString aString, double fVal=0.0):
+maOp(aOp),
maString(aString),
-mfVal(fVal),
-mbUseForEmpty(bUseForEmpty)
+mfVal(fVal)
{ }
TRet operator()(double fVal) const
@@ -2584,7 +2580,7 @@ public:
bool useFunctionForEmpty() const
{
-return mbUseForEmpty;
+return true;
}
};
@@ -2592,21 +2588,21 @@ public:
void ScMatrix::NotOp(svl::SharedString aString, ScMatrix& rMat)
{
-auto not_ = [&](double a, double){return double(a == 0.0);};
+auto not_ = [](double a, double){return double(a == 0.0);};
matop::MatOp aOp(not_, aString);
pImpl->ApplyOperation(aOp, *rMat.pImpl);
}
void ScMatrix::NegOp(svl::SharedString aString, ScMatrix& rMat)
{
-auto neg_ = [&](double a, double){return -a;};
+auto neg_ = [](double a, double){return -a;};
matop::MatOp aOp(neg_, aString);
pImpl->ApplyOperation(aOp, *rMat.pImpl);
}
void ScMatrix::AddOp(svl::SharedString aString, double fVal, ScMatrix& rMat)
{
-auto add_ = [&](double a, double b){return a + b;};
+auto add_ = [](double a, double b){return a + b;};
matop::MatOp aOp(add_, aString, fVal);
pImpl->ApplyOperation(aOp, *rMat.pImpl);
}
@@ -2615,13 +2611,13 @@ void ScMatrix::SubOp(bool bFlag, svl::SharedString
aString, double fVal, ScMatri
{
if (bFlag)
{
-auto sub_ = [&](double a, double b){return b - a;};
+auto sub_ = [](double a, double b){return b - a;};
matop::MatOp aOp(sub_, aString, fVal);
pImpl->ApplyOperation(aOp, *rMat.pImpl);
}
else
{
-auto sub_ = [&](double a, double b){return a - b;};
+auto sub_ = [](double a, double b){return a - b;};
matop::MatOp aOp(sub_, aString, fVal);
pImpl->ApplyOperation(aOp, *rMat.pImpl);
}
@@ -2629,7 +2625,7 @@ void ScMatrix::SubOp(bool bFlag, svl::SharedString
aString, double fVal, ScMatri
void ScMatrix::MulOp(svl::SharedString aString, double fVal, ScMatrix& rMat)
{
-auto mul_ = [&](double a, double b){return a * b;};
+auto mul_ = [](double a, double b){return a * b;};
matop::MatOp aOp(mul_, aString, fVal);
pImpl->ApplyOperation(aOp, *rMat.pImpl);
}
@@ -2638,13 +2634,13 @@ void ScMatrix::DivOp(bool bFlag, svl::SharedString
aString, double fVal, ScMatri
{
if (bFlag)
{
-auto div_ = [&](double a, double b){return sc::div(b, a);};
+auto div_ = [](double a, double b){return sc::div(b, a);};
matop::MatOp aOp(div_, aString,
fVal);
pImpl->ApplyOperation(aOp, *rMat.pImpl);
}
else
{
-auto div_ = [&](double a, double b){return sc::div(a, b);};
+auto div_ = [](double a, double b){return sc::div(a, b);};
matop::MatOp aOp(div_, aString,
fVal);
pImpl->ApplyOperation(aOp, *rMat.pImpl);
}
@@ -2654,13 +2650,13 @@ void ScMatrix::PowOp(bool bFlag, svl::SharedString
aString, double fVal, ScMatri
{
if (bFlag)
{
-auto pow_ = [&](double a, double b){return pow(b, a);};
+auto pow_ = [](double a, double b){return pow(b, a);};
matop::MatOp aOp(pow_, aString, fVal);
pImpl->ApplyOperation(aOp, *rMat.pImpl);
}
else
{
-auto pow_ = [&](double a, double b){return pow(a, b);};
+auto pow_ = [](double a, double b){return pow(a, b);};
matop::MatOp aOp(pow_, aString, fVal);
pImpl->ApplyOperation(aOp, *rMat.pImpl);
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/vclref' - toolkit/source
toolkit/source/awt/vclxwindows.cxx | 204 +
1 file changed, 99 insertions(+), 105 deletions(-)
New commits:
commit e3f9e085cc58bedb82b7f279de642ff5fa2180ce
Author: Michael Meeks
Date: Sat Mar 14 22:30:45 2015 +
toolkit: more cleanup.
Change-Id: I2aa5c818d4f2c07926bda539da30ada63620f69d
diff --git a/toolkit/source/awt/vclxwindows.cxx
b/toolkit/source/awt/vclxwindows.cxx
index 2cd23a9..51f49da 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -1234,7 +1234,7 @@ void VCLXRadioButton::setState( sal_Bool b )
throw(::com::sun::star::uno::Runtim
{
SolarMutexGuard aGuard;
-VclPtr< RadioButton > pButton = GetAs< RadioButton >();
+VclPtr< RadioButton > pRadioButton = GetAs< RadioButton >();
if ( pRadioButton)
{
pRadioButton->Check( b );
@@ -1253,7 +1253,7 @@ sal_Bool VCLXRadioButton::getState()
throw(::com::sun::star::uno::RuntimeExcepti
{
SolarMutexGuard aGuard;
-VclPtr< RadioButton > pButton = GetAs< RadioButton >();
+VclPtr< RadioButton > pRadioButton = GetAs< RadioButton >();
return pRadioButton ? pRadioButton->IsChecked() : sal_False;
}
@@ -1262,7 +1262,7 @@ sal_Bool VCLXRadioButton::getState()
throw(::com::sun::star::uno::RuntimeExcepti
SolarMutexGuard aGuard;
Size aSz;
-VclPtr< RadioButton > pButton = GetAs< RadioButton >();
+VclPtr< RadioButton > pRadioButton = GetAs< RadioButton >();
if ( pRadioButton )
aSz = pRadioButton->CalcMinimumSize();
return AWTSize(aSz);
@@ -1278,7 +1278,7 @@ sal_Bool VCLXRadioButton::getState()
throw(::com::sun::star::uno::RuntimeExcepti
SolarMutexGuard aGuard;
Size aSz = VCLSize(rNewSize);
-VclPtr< RadioButton > pButton = GetAs< RadioButton >();
+VclPtr< RadioButton > pRadioButton = GetAs< RadioButton >();
if ( pRadioButton )
{
Size aMinSz = pRadioButton->CalcMinimumSize();
@@ -1324,7 +1324,7 @@ void VCLXRadioButton::ImplClickedOrToggled( bool bToggled
)
{
// In the formulars, RadioChecked is not enabled, call itemStateChanged
only for click
// In the dialog editor, RadioChecked is enabled, call itemStateChanged
only for bToggled
-VclPtr< RadioButton > pButton = GetAs< RadioButton >();
+VclPtr< RadioButton > pRadioButton = GetAs< RadioButton >();
if ( pRadioButton && ( pRadioButton->IsRadioCheckEnabled() == bToggled )
&& ( bToggled || pRadioButton->IsStateChanged() ) &&
maItemListeners.getLength() )
{
::com::sun::star::awt::ItemEvent aEvent;
@@ -1793,7 +1793,7 @@ void VCLXListBox::ProcessWindowEvent( const
VclWindowEvent& rVclWindowEvent )
{
case VCLEVENT_LISTBOX_SELECT:
{
-VclPtr< ListBox > pBox = GetAs< ListBox >();
+VclPtr< ListBox > pListBox = GetAs< ListBox >();
if( pListBox )
{
bool bDropDown = ( pListBox->GetStyle() & WB_DROPDOWN ) ?
sal_True : sal_False;
@@ -2316,7 +2316,7 @@ sal_Int16 VCLXDialog::execute()
throw(::com::sun::star::uno::RuntimeException, s
sal_Int16 nRet = 0;
if ( GetWindow() )
{
-Dialog* pDlg = static_cast(GetWindow());
+VclPtr< Dialog > pDlg = GetAs< Dialog >();
vcl::Window* pParent = pDlg->GetWindow( WINDOW_PARENTOVERLAP );
vcl::Window* pOldParent = NULL;
vcl::Window* pSetParent = NULL;
@@ -2350,7 +2350,6 @@ void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32
nY ) throw(::com::sun::s
{
SolarMutexGuard aGuard;
VclPtr< vcl::Window > pWindow = GetWindow();
-
if ( pWindow )
{
OutputDevice* pDev = VCLUnoHelper::GetOutputDevice( getGraphics() );
@@ -2369,7 +2368,7 @@ void SAL_CALL VCLXDialog::draw( sal_Int32 nX, sal_Int32
nY ) throw(::com::sun::s
::com::sun::star::awt::DeviceInfo aInfo = VCLXDevice::getInfo();
SolarMutexGuard aGuard;
-Dialog* pDlg = static_cast(GetWindow());
+VclPtr< Dialog > pDlg = GetAs< Dialog >();
if ( pDlg )
pDlg->GetDrawWindowBorder( aInfo.LeftInset, aInfo.TopInset,
aInfo.RightInset, aInfo.BottomInset );
@@ -2382,8 +2381,7 @@ void SAL_CALL VCLXDialog::setProperty(
throw(::com::sun::star::uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
-
-Dialog* pDialog = static_cast(GetWindow());
+VclPtr< Dialog > pDialog = GetAs< Dialog >();
if ( pDialog )
{
bool bVoid = Value.getValueType().getTypeClass() ==
::com::sun::star::uno::TypeClass_VOID;
@@ -2536,7 +2534,7 @@ throw(::com::sun::star::uno::RuntimeException,
std::exception)
SolarMutexGuard aGuard;
OSL_TRACE(" VCLXMultiPage::setProperty( %s )", OUStringToOString(
PropertyName, RTL_TEXTENCODING_UTF8 ).getStr() );
-TabControl* pTabControl = static_cast(GetWindow());
+VclPtr< TabControl > pTabControl = GetAs< TabControl >();
if ( pTabControl )
{
bool bVoid = Value.getValueType().getTypeClass() ==
::c
[Libreoffice-commits] core.git: Branch 'feature/vclref' - include/toolkit sfx2/source toolkit/source
include/toolkit/awt/vclxaccessiblecomponent.hxx |3
include/toolkit/awt/vclxdevice.hxx | 19 --
include/toolkit/awt/vclxwindow.hxx |8
sfx2/source/view/viewprn.cxx|2
toolkit/source/awt/animatedimagespeer.cxx | 39 +---
toolkit/source/awt/vclxaccessiblecomponent.cxx | 21 +-
toolkit/source/awt/vclxdevice.cxx | 23 --
toolkit/source/awt/vclxspinbutton.cxx |2
toolkit/source/awt/vclxtabpagecontainer.cxx | 31 ++-
toolkit/source/awt/vclxwindow.cxx | 10 -
toolkit/source/awt/vclxwindows.cxx | 208 ++--
11 files changed, 167 insertions(+), 199 deletions(-)
New commits:
commit 9720b6827541d937d06540ec9bb11780aef934d9
Author: Michael Meeks
Date: Sat Mar 14 22:17:43 2015 +
toolkit: first cut at switching to VclPtr.
Toolkit has traditionally had a very odd lifecycle relationship
with VCL - start to fix that; first partial cut.
Change-Id: I77e5e62ebde101d32746d12d83dae92c49970001
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx
b/include/toolkit/awt/vclxaccessiblecomponent.hxx
index d27228c..dd72bd2 100644
--- a/include/toolkit/awt/vclxaccessiblecomponent.hxx
+++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx
@@ -33,6 +33,7 @@
#include
#include
+#include
namespace vcl { class Window; }
class VCLXWindow;
@@ -83,7 +84,7 @@ public:
virtual ~VCLXAccessibleComponent();
VCLXWindow*GetVCLXWindow() const { return mpVCLXindow; }
-vcl::Window*GetWindow() const;
+VclPtr GetWindow() const;
virtual void SAL_CALL disposing() SAL_OVERRIDE;
diff --git a/include/toolkit/awt/vclxdevice.hxx
b/include/toolkit/awt/vclxdevice.hxx
index 61d5689..751ffd8 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -27,43 +27,40 @@
#include
#include
#include
+#include
#include
class OutputDevice;
class VirtualDevice;
-
-// class VCLXDevice
-
-
// For using nDummy, no incompatible update, add a sal_Bool
bCreatedWithToolkitMember later...
#define FLAGS_CREATEDWITHTOOLKIT0x0001
-class TOOLKIT_DLLPUBLIC VCLXDevice :public ::com::sun::star::awt::XDevice,
+/// An UNO wrapper for the VCL OutputDevice
+class TOOLKIT_DLLPUBLIC VCLXDevice :
+public ::com::sun::star::awt::XDevice,
public ::com::sun::star::lang::XTypeProvider,
public ::com::sun::star::lang::XUnoTunnel,
public ::com::sun::star::awt::XUnitConversion,
public ::cppu::OWeakObject
{
friend class VCLXGraphics;
+friend class VCLXVirtualDevice;
private:
-OutputDevice* mpOutputDevice;
+VclPtrmpOutputDevice;
public:
void* pDummy;
sal_uInt32 nFlags;
-protected:
-voidDestroyOutputDevice();
-
public:
VCLXDevice();
virtual ~VCLXDevice();
-voidSetOutputDevice( OutputDevice* pOutDev ) {
mpOutputDevice = pOutDev; }
-OutputDevice* GetOutputDevice() const { return mpOutputDevice; }
+voidSetOutputDevice( VclPtr pOutDev ) {
mpOutputDevice = pOutDev; }
+VclPtrGetOutputDevice() const { return mpOutputDevice; }
voidSetCreatedWithToolkit( bool bCreatedWithToolkit );
diff --git a/include/toolkit/awt/vclxwindow.hxx
b/include/toolkit/awt/vclxwindow.hxx
index 6306ce6..dfc42aa 100644
--- a/include/toolkit/awt/vclxwindow.hxx
+++ b/include/toolkit/awt/vclxwindow.hxx
@@ -128,8 +128,12 @@ public:
VCLXWindow( bool bWithDefaultProps = false );
virtual ~VCLXWindow();
-virtual voidSetWindow( vcl::Window* pWindow );
-vcl::Window*GetWindow() const { return
static_cast(GetOutputDevice()); }
+virtual voidSetWindow( VclPtr pWindow );
+template< class derived_type > VclPtr< derived_type > GetAs() const {
+return VclPtr< derived_type >( static_cast< derived_type * >(
GetOutputDevice().get() ) ); }
+template< class derived_type > VclPtr< derived_type > GetAsDynamic() const
{
+return VclPtr< derived_type >( dynamic_cast< derived_type * >(
GetOutputDevice().get() ) ); }
+VclPtr GetWindow() const { return GetAs(); }
voidsuspendVclEventListening( );
voidresumeVclEventListening( );
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 776e6ca..bfe2825 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -209,7 +209,7 @@ Sequence< beans::PropertyValue >
SfxPrinterController::getMergedOptions() const
{
mpLastPrinter = pPrinter.get();
VCLXDevice* pXDevice = new VCLXDevice();
-pXDevice->SetOutputDevice( mpLastPrinter );
+pXDevice->SetOutputDevicePtr( mpLastPrinter );
[Libreoffice-commits] core.git: Branch 'feature/vclref' - include/vcl vcl/source
include/vcl/outdev.hxx | 30 +-
include/vcl/window.hxx | 19 ---
vcl/source/outdev/outdev.cxx | 19 +++
vcl/source/window/window.cxx | 17 +++--
4 files changed, 51 insertions(+), 34 deletions(-)
New commits:
commit a66896819678367f4e13c08a14b74cddccd13097
Author: Michael Meeks
Date: Sat Mar 14 22:16:11 2015 +
vclptr: move down impl. to OutputDevice
Ultimately we will want to ref-count & VclPtr OutputDevice instances
separately from Window - but for now merge. This helps fix the amazing
lifecycle foo in toolkit/
Change-Id: If40ee9f645c87aff08815926205e908205bdd67a
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index 23abb00..c94b76f 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -259,6 +259,26 @@ class VCL_DLLPUBLIC OutputDevice: private
boost::noncopyable
friend class vcl::PDFWriterImpl;
friend void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long
nNewHeight );
+// All of this will need to be replicated in Window
+// or a shared base-class as/when we can break the
+// OutputDevice -> Window inheritance.
+private:
+mutable int mnRefCnt; // reference count
+
+template friend class ::rtl::Reference;
+template friend class ::VclPtr;
+
+inline void acquire() const
+{
+mnRefCnt++;
+}
+
+inline void release() const
+{
+if (!--mnRefCnt)
+delete const_cast(this);
+}
+
private:
mutable SalGraphics*mpGraphics; ///< Graphics context
to draw on
mutable OutputDevice* mpPrevGraphics; ///< Previous output
device in list
@@ -345,6 +365,7 @@ private:
mutable boolmbTextSpecial : 1;
mutable boolmbRefPoint : 1;
mutable boolmbEnableRTL : 1;
+mutable boolmbDisposed : 1;
/** @name Initialization and accessor functions
*/
@@ -352,10 +373,17 @@ private:
protected:
OutputDevice();
-
public:
virtual ~OutputDevice();
+protected:
+/// release all references to other objects.
+virtual voiddispose();
+
+public:
+/// call the dispose() method if we have not already been disposed.
+voiddisposeOnce();
+
public:
/** Get the graphic context that the output device uses to draw on.
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 67ebe60..5f0be55 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -405,8 +405,6 @@ private:
// OutputDevice
::OutputDevice* mpOutputDevice;
-mutable int mnRefCnt; // reference count
-
#ifdef DBG_UTIL
friend const char* ::ImplDbgCheckWindow( const void* pObj );
#endif
@@ -485,27 +483,10 @@ public:
SAL_DLLPRIVATE static void ImplCalcSymbolRect( Rectangle& rRect );
-private:
-template friend class ::rtl::Reference;
-template friend class ::VclPtr;
-
-inline void acquire() const
-{
-mnRefCnt++;
-}
-
-inline void release() const
-{
-if (!--mnRefCnt)
-delete const_cast(this);
-}
-
protected:
/** This is intended to be used to clear any locally held references to
other Window-subclass objects */
virtual voiddispose();
-/* call the dispose() method if we have not already been disposed */
-voiddisposeOnce();
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent,
WinBits nStyle, SystemParentData* pSystemParentData );
diff --git a/vcl/source/outdev/outdev.cxx b/vcl/source/outdev/outdev.cxx
index 82b80c3..7436b10 100644
--- a/vcl/source/outdev/outdev.cxx
+++ b/vcl/source/outdev/outdev.cxx
@@ -181,7 +181,26 @@ OutputDevice::OutputDevice() :
OutputDevice::~OutputDevice()
{
+disposeOnce();
+}
+
+void OutputDevice::disposeOnce()
+{
+if ( mbDisposed )
+return;
+mbDisposed = true;
+// catch badness where our OutputDevice sub-class was not
+// wrapped safely in a VclPtr cosily.
+assert( mnRefCnt > 0 );
+
+// hold a ref in case something unusual happens during dispose.
+VclPtr aRef(this);
+dispose();
+}
+
+void OutputDevice::dispose()
+{
if ( GetUnoGraphicsList() )
{
UnoWrapperBase* pWrapper = Application::GetUnoWrapper( false );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 423dd0e..3b6f3e7 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -137,23 +137,10 @@ bool Window::IsDisposed() const
return !mpWindowImpl;
}
-void Window::disposeOnce()
+void Window::dispose()
{
-if (!mpWindowImpl || mpWindowImpl->mbInDispose)
-return;
mpWindowImpl->mbInDispose = true;
-// cat
build fails in postprocess/qa/services.cxx
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi, for quite a while I have the following problem: branch: master ./g pull -r make fails in postprocess/qa/services.cxx with error message: services.cxx:231:Assertion Test name: (anonymous namespace)::Test::test forced failure - - creating "com.sun.star.wizards.agenda.CallWizard" caused com.sun.star.uno.RuntimeException "unsatisfied query for interface of type com.sun.star.loader.XImplementationLoader!" Before that I get lots of messeage like no obvious way to instantiate implementation "com.sun.star.i18n.Transliteration.ignoreSpace_ja_JP" no obvious way to instantiate implementation "com.sun.star.i18n.Transliteration.ignoreTiJi_ja_JP" no obvious way to instantiate implementation "com.sun.star.i18n.Transliteration.ignoreTraditionalKana_ja_JP" no obvious way to instantiate implementation "com.sun.star.i18n.Transliteration.ignoreTraditionalKanji_ja_JP" no obvious way to instantiate implementation "com.sun.star.i18n.Transliteration.ignoreZiZu_ja_JP" no obvious way to instantiate implementation "com.sun.star.i18n.Transliteration.largeToSmall_ja_JP" no obvious way to instantiate implementation "com.sun.star.i18n.Transliteration.smallToLarge_ja_JP" no obvious way to instantiate implementation "com.sun.star.office.comp.Acceptor" no obvious way to instantiate implementation "com.sun.star.office.comp.PipeSplashScreen" no obvious way to instantiate implementation "com.sun.star.office.comp.SplashScreen" no obvious way to instantiate implementation "com.sun.star.report.comp.ReportToolboxController" no obvious way to instantiate implementation "com.sun.star.report.comp.StatusbarController" no obvious way to instantiate implementation "com.sun.star.script.framework.security.SecurityDialog" no obvious way to instantiate implementation "com.sun.star.script.provider.ScriptURIHelper" no obvious way to instantiate implementation "com.sun.star.sdb.ApplicationToolboxController" no obvious way to instantiate implementation "com.sun.star.svtools.OfficeFilePicker" no obvious way to instantiate implementation "com.sun.star.svtools.OfficeFolderPicker" Any hint what is going wrong here? Usually I disabled the test, fixed some bug, pushed my fix and after ./g pull -r I had to disable the test again. But clearly that is far from being optimal... Christina -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQEcBAEBAgAGBQJVBJ69AAoJEN/hiApPuw9SrNsIAK7CCi7QyW0ZtHHoM+PUWE+3 eIXTJRuRRJkBRp5gkQMNsWaNU9IpQDJJd6g/s9j5yFyGrY0bSIi/dps0XaUUudZV r/9jUTQZ30YK4KNHd0cNq1gm2Z5HtDlkFPQw7lJRRFR7f20fjMv4hH7HVUGZ7o8S NL+dw9+4EMPkiOI4suUSPitEXHfP1zHgsdFFucaOAO7T6265gDmdU2tEEn8MA09D UrashmSn22ahU4/peSTyKKxEcTUzeN46wlE8tZV7Ny4Gn7dlCQpeiwJANSj4BUth 1Nh6teBB6YpOueBseFkUnOliswaOtWPtiWrbO5WMKYCNCCn8R2xpAP4HzyxMwm4= =4JsZ -END PGP SIGNATURE- ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 34882] Special character favorites
https://bugs.documentfoundation.org/show_bug.cgi?id=34882 Jay Philips changed: What|Removed |Added CC||philip...@hotmail.com --- Comment #9 from Jay Philips --- A believe a special character split/group button would be the better approach, as it is used in other word processors. MS Word - http://i.imgur.com/GiyojNv.png WPS Writer - http://i.imgur.com/05A02N9.png Wordperfect - http://i.imgur.com/gsxv8a3.png -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: [Libreoffice-qa] [ANN] LibreOffice 4.4.2 RC1 available
Hi Jean-Baptiste, *, Am 13.03.2015 11:31 schrieb "Jean-Baptiste Faure" : er a écrit : > > A MS-Windows tester tell me that the MS-Windows build is in fact : > > 4.5.0.0.alpha0+ > Build ID: c14ed48c65f20a63da930a526c2a6294d3a3f565 > TinderBox: Win-x86@42, That windows tester did not download the release candidate build, but one of the daily builds provided by tinderboxes. In this case, even not from the libreoffice-4-4 branch (that would at this point in time be very similar to the rc, but from master, so completely different codebase. > Do you know what happened ? Either downloaded or started the wrong version. Ciao Christian ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-2' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 93cede9efbcef239f65cbb507df49c31ddb5f4ef Author: Andras Timar Date: Sat Mar 14 20:01:49 2015 +0100 Updated core Project: translations 6a1faadb92c350550da21bef341383e12f7bd5a1 diff --git a/translations b/translations index 539e3d7..6a1faad 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 539e3d735f12cc64a95f370be694fdc0211e7041 +Subproject commit 6a1faadb92c350550da21bef341383e12f7bd5a1 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-4-4-2' - source/hu
source/hu/accessibility/source/helper.po |2 source/hu/avmedia/source/framework.po |2 source/hu/basctl/source/basicide.po |2 source/hu/basic/source/classes.po |2 source/hu/basic/source/sbx.po |2 source/hu/chart2/source/controller/dialogs.po | 12 source/hu/chart2/uiconfig/ui.po | 10 source/hu/connectivity/registry/ado/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/calc/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/dbase/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/firebird/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/flat/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/jdbc/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/kab/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/macab/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/mork/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/mozab/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/mysql/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/odbc/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/postgresql/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/tdeab/org/openoffice/Office/DataAccess.po |2 source/hu/cui/source/dialogs.po | 18 source/hu/cui/uiconfig/ui.po | 902 +++--- source/hu/dbaccess/source/core/resource.po |2 source/hu/dbaccess/source/sdbtools/resource.po |2 source/hu/dbaccess/source/ui/app.po |6 source/hu/dbaccess/source/ui/browser.po |6 source/hu/dbaccess/source/ui/control.po |2 source/hu/dbaccess/source/ui/dlg.po |6 source/hu/dbaccess/source/ui/inc.po |2 source/hu/dbaccess/source/ui/uno.po |2 source/hu/dbaccess/uiconfig/ui.po | 14 source/hu/desktop/source/deployment/manager.po |2 source/hu/desktop/source/deployment/misc.po |2 source/hu/desktop/source/deployment/registry.po |2 source/hu/desktop/source/deployment/registry/component.po |2 source/hu/desktop/source/deployment/registry/configuration.po |2 source/hu/desktop/source/deployment/registry/help.po |2 source/hu/desktop/source/deployment/registry/package.po |2 source/hu/desktop/source/deployment/registry/script.po |2 source/hu/desktop/source/deployment/registry/sfwk.po |2 source/hu/desktop/source/deployment/unopkg.po |2 source/hu/dictionaries/af_ZA.po |2 source/hu/dictionaries/an_ES.po |2 source/hu/dictionaries/ar.po |2 source/hu/dictionaries/be_BY.po |2 source/hu/dictionaries/bg_BG.po |2 source/hu/dictionaries/bn_BD.po |2 source/hu/dictionaries/br_FR.po |2 source/hu/dictionaries/bs_BA.po |2 source/hu/dictionaries/da_DK.po |2 source/hu/dictionaries/de.po |2 source/hu/dictionaries/el_GR.po |2 source/hu/dictionaries/en.po |2 sour
[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - translations
translations |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4e73de445d78650b14c209a3a6a048124124e1c6 Author: Andras Timar Date: Sat Mar 14 20:01:49 2015 +0100 Updated core Project: translations bd4a0f7b8221b0c467ea9a1c5e75912b492c0186 diff --git a/translations b/translations index 961bd6f..bd4a0f7 16 --- a/translations +++ b/translations @@ -1 +1 @@ -Subproject commit 961bd6f3fa7eac6391de5b0dd3cd76ebe55539bc +Subproject commit bd4a0f7b8221b0c467ea9a1c5e75912b492c0186 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] translations.git: Branch 'libreoffice-4-4' - source/hu
source/hu/accessibility/source/helper.po |2 source/hu/avmedia/source/framework.po |2 source/hu/basctl/source/basicide.po |2 source/hu/basic/source/classes.po |2 source/hu/basic/source/sbx.po |2 source/hu/chart2/source/controller/dialogs.po | 12 source/hu/chart2/uiconfig/ui.po | 10 source/hu/connectivity/registry/ado/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/calc/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/dbase/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/evoab2/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/firebird/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/flat/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/hsqldb/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/jdbc/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/kab/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/macab/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/mork/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/mozab/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/mysql/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/odbc/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/postgresql/org/openoffice/Office/DataAccess.po |2 source/hu/connectivity/registry/tdeab/org/openoffice/Office/DataAccess.po |2 source/hu/cui/source/dialogs.po | 18 source/hu/cui/uiconfig/ui.po | 902 +++--- source/hu/dbaccess/source/core/resource.po |2 source/hu/dbaccess/source/sdbtools/resource.po |2 source/hu/dbaccess/source/ui/app.po |6 source/hu/dbaccess/source/ui/browser.po |6 source/hu/dbaccess/source/ui/control.po |2 source/hu/dbaccess/source/ui/dlg.po |6 source/hu/dbaccess/source/ui/inc.po |2 source/hu/dbaccess/source/ui/uno.po |2 source/hu/dbaccess/uiconfig/ui.po | 14 source/hu/desktop/source/deployment/manager.po |2 source/hu/desktop/source/deployment/misc.po |2 source/hu/desktop/source/deployment/registry.po |2 source/hu/desktop/source/deployment/registry/component.po |2 source/hu/desktop/source/deployment/registry/configuration.po |2 source/hu/desktop/source/deployment/registry/help.po |2 source/hu/desktop/source/deployment/registry/package.po |2 source/hu/desktop/source/deployment/registry/script.po |2 source/hu/desktop/source/deployment/registry/sfwk.po |2 source/hu/desktop/source/deployment/unopkg.po |2 source/hu/dictionaries/af_ZA.po |2 source/hu/dictionaries/an_ES.po |2 source/hu/dictionaries/ar.po |2 source/hu/dictionaries/be_BY.po |2 source/hu/dictionaries/bg_BG.po |2 source/hu/dictionaries/bn_BD.po |2 source/hu/dictionaries/br_FR.po |2 source/hu/dictionaries/bs_BA.po |2 source/hu/dictionaries/da_DK.po |2 source/hu/dictionaries/de.po |2 source/hu/dictionaries/el_GR.po |2 source/hu/dictionaries/en.po |2 sour
Re: Unable to build libre office
Hi, It's connecting to Internet (in your case a proxy) because LO uses open source third-party software component. Right now, http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2 works. Could you retry or check your proxy if it still fails? Julien -- View this message in context: http://nabble.documentfoundation.org/Unable-to-build-libre-office-tp4143201p4143273.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] help.git: source/text
source/text/scalc/guide/printranges.xhp | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) New commits: commit 72447651c8cff60b354021d0a9da89abc1757ee8 Author: Andras Timar Date: Sat Mar 14 19:15:36 2015 +0100 s/Remove/Clear/ to match UI Change-Id: I813d6c636d4171ff2ac64672b1c22b9b6cf985e2 diff --git a/source/text/scalc/guide/printranges.xhp b/source/text/scalc/guide/printranges.xhp index 9403166..371399e 100644 --- a/source/text/scalc/guide/printranges.xhp +++ b/source/text/scalc/guide/printranges.xhp @@ -29,9 +29,9 @@ - - - + + + exporting;cells printing; cells ranges;print ranges @@ -46,7 +46,7 @@ mw deleted "adding;" and corrected two typos in "defining;" and "extending.." MW changed "clearing," - Defining Print Ranges on a Sheet + Defining Print Ranges on a Sheet You can define which range of cells on a spreadsheet to print. The cells on the sheet that are not part of the defined print range are not printed or exported. Sheets without a defined print range are not printed and not exported to a PDF file, unless the document uses the Excel file format. @@ -72,7 +72,7 @@ To Clear a Print Range -Choose Format - Print Ranges - Remove. +Choose Format - Print Ranges - Clear. Using the Page Break Preview to Edit Print Ranges @@ -95,11 +95,11 @@ - + Editing Print Ranges - + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8d6de3c33fd392ae26dde82e729335fbe80cd418 Author: Andras Timar Date: Sat Mar 14 19:15:36 2015 +0100 Updated core Project: help 72447651c8cff60b354021d0a9da89abc1757ee8 diff --git a/helpcontent2 b/helpcontent2 index 00946ca..7244765 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 00946ca3f8cd3837129c714e025d6ca2ae783ad8 +Subproject commit 72447651c8cff60b354021d0a9da89abc1757ee8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unable to build libre office
The full error is as follows: shally@shally-TravelMate-P643-M:~/git/libreoffice$ make cd /home/shally/git/libreoffice/external/tarballs/tmp && wget --progress=dot:mega -Q 0 -P "." -l 0 -nd -nH -N http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2 2>&1 | tee -a /home/shally/git/libreoffice/external/tarballs/fetch.log && [ $PIPESTATUS -eq 0 ] && SUM=`md5sum libabw-0.1.1.tar.bz2 | sed "s/ .*//"` && if test "$SUM" != "7a3815b506d064313ba309617b6f5a0b"; then echo ERROR: expected checksum for libabw-0.1.1.tar.bz2 is 7a3815b506d064313ba309617b6f5a0b 2>&1 | tee -a /home/shally/git/libreoffice/external/tarballs/fetch.log; false; fi && mv libabw-0.1.1.tar.bz2 ../ --2015-03-14 10:27:38-- http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2 Connecting to 172.16.19.10:80... connected. Proxy request sent, awaiting response... 502 Bad Gateway 2015-03-14 10:29:23 ERROR 502: Bad Gateway. make: *** [/home/shally/git/libreoffice/workdir/download] Error 1 Why is it first connecting to the proxy server?? Regards, Anjali On Sat, Mar 14, 2015 at 2:49 PM, David Tardon wrote: > Hi, > > On Sat, Mar 14, 2015 at 10:42:57AM +0530, Anjali Shally wrote: > > Hi, > > My name is Anjali.I am applying for GSOC this time.While building libre > > office am getting the following error when running make command: > > make: *** [../libreoffice/workdir/download] Error 1 > > This is only the last line and it is useless for a diagnose. There > should have been a failed command up the output list, which would point > to the problem. What happens if you re-run make? > > D. > ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
GSoC 2015 project
Hi, I am Tarun, a sophomore year undergraduate student at IIIT-Hyderabad. I am very much interested in "Add Gtk3 gesture support to impress slideshows" project. I have good C++ skills and I want to contribute to this project. Please guide me. Thanking You, Tarun ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sw/qa sw/source writerfilter/source
dev/null |binary
sw/qa/extras/uiwriter/data/tdf90003.odt |binary
sw/qa/extras/uiwriter/uiwriter.cxx| 23 +--
sw/source/core/text/itrform2.cxx |7
sw/source/uibase/inc/wrtsh.hxx| 110 +++---
sw/source/uibase/wrtsh/move.cxx | 108 +++---
sw/source/uibase/wrtsh/select.cxx | 196 +-
sw/source/uibase/wrtsh/wrtsh1.cxx | 58 +++
sw/source/uibase/wrtsh/wrtsh2.cxx |8 -
sw/source/uibase/wrtsh/wrtsh3.cxx | 18 +-
sw/source/uibase/wrtsh/wrtundo.cxx|4
writerfilter/source/dmapper/SettingsTable.cxx | 26 +--
12 files changed, 275 insertions(+), 283 deletions(-)
New commits:
commit bcefd5cda926f86db16b1bcf6838431b5b0d61b5
Author: Miklos Vajna
Date: Sat Mar 14 15:55:40 2015 +0100
SwWrtShell: rename member variables missing their prefixes
Change-Id: I78ae647cca9167e130592fd11b8dd15c512a2353
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 2e7c4cd..7880165 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -94,19 +94,19 @@ private:
typedef long (SwWrtShell::*SELECTFUNC)(const Point *, bool bProp );
-SELECTFUNC fnDrag;
-SELECTFUNC fnSetCrsr;
-SELECTFUNC fnEndDrag;
-SELECTFUNC fnKillSel;
+SELECTFUNC m_fnDrag;
+SELECTFUNC m_fnSetCrsr;
+SELECTFUNC m_fnEndDrag;
+SELECTFUNC m_fnKillSel;
public:
using SwEditShell::Insert;
-long SetCursor(const Point* pPt, bool bProp) { return
(this->*fnSetCrsr)(pPt, bProp); }
-long Drag (const Point* pPt, bool bProp) { return
(this->*fnDrag)(pPt, bProp); }
-long EndDrag (const Point* pPt, bool bProp) { return
(this->*fnEndDrag)(pPt, bProp); }
-long KillSelection(const Point* pPt, bool bProp) { return
(this->*fnKillSel)(pPt, bProp); }
+long SetCursor(const Point* pPt, bool bProp) { return
(this->*m_fnSetCrsr)(pPt, bProp); }
+long Drag (const Point* pPt, bool bProp) { return
(this->*m_fnDrag)(pPt, bProp); }
+long EndDrag (const Point* pPt, bool bProp) { return
(this->*m_fnEndDrag)(pPt, bProp); }
+long KillSelection(const Point* pPt, bool bProp) { return
(this->*m_fnKillSel)(pPt, bProp); }
// reset all selections
long ResetSelect( const Point *, bool );
@@ -115,45 +115,45 @@ public:
inline void ResetCursorStack();
SelectionType GetSelectionType() const;
-boolIsModePushed() const { return 0 != pModeStack; }
+boolIsModePushed() const { return 0 != m_pModeStack; }
voidPushMode();
voidPopMode();
voidSttSelect();
voidEndSelect();
-boolIsInSelect() const { return bInSelect; }
-voidSetInSelect(bool bSel = true) { bInSelect = bSel; }
+boolIsInSelect() const { return m_bInSelect; }
+voidSetInSelect(bool bSel = true) { m_bInSelect = bSel; }
// is there a text- or frameselection?
boolHasSelection() const { return SwCrsrShell::HasSelection() ||
IsMultiSelection() || IsSelFrmMode()
|| IsObjSelected(); }
bool Pop( bool bOldCrsr = true );
voidEnterStdMode();
-boolIsStdMode() const { return !bExtMode && !bAddMode && !bBlockMode; }
+boolIsStdMode() const { return !m_bExtMode && !m_bAddMode &&
!m_bBlockMode; }
voidEnterExtMode();
voidLeaveExtMode();
boolToggleExtMode();
-boolIsExtMode() const { return bExtMode; }
+boolIsExtMode() const { return m_bExtMode; }
voidEnterAddMode();
voidLeaveAddMode();
boolToggleAddMode();
-boolIsAddMode() const { return bAddMode; }
+boolIsAddMode() const { return m_bAddMode; }
voidEnterBlockMode();
voidLeaveBlockMode();
boolToggleBlockMode();
-boolIsBlockMode() const { return bBlockMode; }
+boolIsBlockMode() const { return m_bBlockMode; }
voidSetInsMode( bool bOn = true );
-voidToggleInsMode() { SetInsMode( !bIns ); }
-boolIsInsMode() const { return bIns; }
+voidToggleInsMode() { SetInsMode( !m_bIns ); }
+boolIsInsMode() const { return m_bIns; }
voidSetRedlineModeAndCheckInsMode( sal_uInt16 eMode );
voidEnterSelFrmMode(const Point *pStartDrag = 0);
voidLeaveSelFrmMode();
-boolIsSelFrmMode() const { return bLayoutMode; }
+boolIsSelFrmMode() const { return m_bLayoutMode; }
// reset selection of frames
voidUnSelectFrm();
@@ -164,9 +164,9 @@ public:
inline void EndSelTblCells();
// leave per word or per line selection mode. Is usually called in MB-Up.
-boolIsExtSel() const { return bSelWrd || bSelLn; }
+boolIsExtSel() const { return m_bSelWrd || m_bSelLn; }
-// query wheth
[Libreoffice-commits] core.git: wizards/source
wizards/source/access2base/Application.xba | 19 +-- wizards/source/access2base/CommandBar.xba| 10 +- wizards/source/access2base/CommandBarControl.xba | 10 +- wizards/source/access2base/DoCmd.xba |4 wizards/source/access2base/PropertiesGet.xba | 12 ++-- wizards/source/access2base/acConstants.xba |1 + 6 files changed, 30 insertions(+), 26 deletions(-) New commits: commit 9107771ab60c67b83b382e80a95e22118a55596f Author: Jean-Pierre Ledure Date: Sat Mar 14 15:54:55 2015 +0100 Access2Base - Better window type recognition Add'l BuiltIn i.o. Builtin (cfr. MSAccess property) Change-Id: Idb539a8e259f76e96224526fd9e2b7a54effec1d diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba index f5cb6c9..70c98db 100644 --- a/wizards/source/access2base/Application.xba +++ b/wizards/source/access2base/Application.xba @@ -430,7 +430,6 @@ Dim oWindow As Object, iWindowType As Integer Dim i As Integer, j As Integer, k As Integer, bFound As Boolean Dim sSupportedModules() As Variant, vModules() As Variant, oModuleUI As Object Dim oToolbar As Object, sToolbarName As String, vUIElements() As Variant, sToolbarFullName As String, iBuiltin As Integer -Dim sFileSuffix As String Const cstCustom = "CUSTOM" @@ -443,7 +442,7 @@ Const cstCustom = "CUSTOM" bFound = False iBuiltin = 1' Default = builtin - Set oWindow = _SelectWindow + Set oWindow = _SelectWindow() If IsNull(oWindow.Frame) Then Goto Trace_WindowError ' List of 21 modules @@ -460,14 +459,12 @@ Const cstCustom = "CUSTOM" Case acReport sSupportedModules = Array( "com.sun.star.sdb.TextReportDesign" ) Case acDocument - sFileSuffix = "" - If Len(oWindow._Name) > 4 Then sFileSuffix = LCase(Right(oWindow._Name, 4)) - Select Case sFileSuffix - Case ".ods" : sSupportedModules = Array( "com.sun.star.sheet.SpreadsheetDocument" ) - Case ".odt", ".odm" : sSupportedModules = Array( "com.sun.star.text.TextDocument" ) - Case ".odp" : sSupportedModules = Array( "com.sun.star.presentation.PresentationDocument" ) - Case ".odg" : sSupportedModules = Array( "com.sun.star.drawing.DrawingDocument") - Case ".odf" : sSupportedModules = Array( "com.sun.star.formula.FormulaProperties" ) + Select Case oWindow.DocumentType + Case docCalc: sSupportedModules = Array( "com.sun.star.sheet.SpreadsheetDocument" ) + Case docWriter : sSupportedModules = Array( "com.sun.star.text.TextDocument" ) + Case docImpress : sSupportedModules = Array( "com.sun.star.presentation.PresentationDocument" ) + Case docDraw: sSupportedModules = Array( "com.sun.star.drawing.DrawingDocument") + Case docMath: sSupportedModules = Array( "com.sun.star.formula.FormulaProperties" ) Case Else : sSupportedModules = Array() End Select Case acTable, acQuery @@ -476,6 +473,8 @@ Const cstCustom = "CUSTOM" ) Case acDiagram sSupportedModules = Array( "com.sun.star.sdb.RelationDesign" ) + Case acWelcome + sSupportedModules = Array( "com.sun.star.frame.StartModule" ) Case Else sSupportedModules = Array() End Select diff --git a/wizards/source/access2base/CommandBar.xba b/wizards/source/access2base/CommandBar.xba index 95e27cf..93bc884 100644 --- a/wizards/source/access2base/CommandBar.xba +++ b/wizards/source/access2base/CommandBar.xba @@ -53,9 +53,9 @@ REM --- CLASS GET/LET/SET PROPERTIES --- REM --- REM --
Crash test update
New crashtest update available at http://dev-builds.libreoffice.org/crashtest/d1c9e5ee53f8609092ea026639c8f28afec1d36a/ exportCrashes.csv Description: Binary data importCrash.csv Description: Binary data validationErrors.csv Description: Binary data ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.documentfoundation.org/show_bug.cgi?id=79641 Bug 79641 depends on bug 89780, which changed state. Bug 89780 Summary: Any text placed on a slide is NOT shown when starting the slideshow from that slide https://bugs.documentfoundation.org/show_bug.cgi?id=89780 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |WORKSFORME -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
PING - GSoC 2015
Hello, I'm Łukasz Hryniuk, a third year a Math student at University of Wrocław, in Poland. On #libreoffice-dev channel I'm known as lukequaint. I'm currently fixing Bug 89387 - improve performance for some matrix operations (one commit was merged - as I've been told it should be enough for Easy Hack requirement, but I keep working on it ;) ). I would like to help Libre Office during Google Summer of Code by implementing one of these ideas: "Implement EPUB export filter", "Improve automated error checking" or "Add Impress shape animations that use a real physics engine". I'm getting familiar with code now, reading "documentation" on blogs/wiki and asking some questions on IRC. Best regards, Łukasz Hryniuk ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - sw/source writerfilter/source
sw/source/filter/rtf/swparrtf.cxx|5 -
sw/source/filter/ww8/docxattributeoutput.cxx |8 +++-
sw/source/filter/ww8/docxsdrexport.cxx | 18 --
sw/source/filter/ww8/docxsdrexport.hxx |3 +--
writerfilter/source/dmapper/SdtHelper.cxx|1 -
writerfilter/source/filter/WriterFilter.cxx |5 -
writerfilter/source/filter/WriterFilterDetection.cxx |3 ---
7 files changed, 8 insertions(+), 35 deletions(-)
New commits:
commit f21e8575326430d29bfe3a5c17b923f8f38cc20c
Author: Miklos Vajna
Date: Sat Mar 14 10:41:49 2015 +0100
DocxSdrExport::Impl::m_pFlyAttrList: use unique_ptr
Change-Id: I3424af5e3c10eef454cb6a17ec6e84113fbe10f4
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx
b/sw/source/filter/ww8/docxattributeoutput.cxx
index 99b4fbc..6b125c0 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -845,8 +845,7 @@ void
DocxAttributeOutput::WriteCollectedParagraphProperties()
{
if ( m_rExport.SdrExporter().getFlyAttrList() )
{
-XFastAttributeListRef xAttrList(
m_rExport.SdrExporter().getFlyAttrList() );
-m_rExport.SdrExporter().setFlyAttrList(NULL);
+XFastAttributeListRef xAttrList(
m_rExport.SdrExporter().getFlyAttrList().release() );
m_pSerializer->singleElementNS( XML_w, XML_framePr, xAttrList );
}
@@ -2385,9 +2384,8 @@ void DocxAttributeOutput::Redline( const SwRedlineData*
pRedlineData)
// to the DOCX when the function
'WriteCollectedParagraphProperties' gets called.
// So we need to store the current status of these lists,
so that we can revert back to them when
// we are done exporting the redline attributes.
-::sax_fastparser::FastAttributeList *pFlyAttrList_Original
= m_rExport.SdrExporter().getFlyAttrList();
+std::unique_ptr
pFlyAttrList_Original(m_rExport.SdrExporter().getFlyAttrList().release());
std::unique_ptr
pParagraphSpacingAttrList_Original(m_pParagraphSpacingAttrList.release());
-m_rExport.SdrExporter().setFlyAttrList(NULL);
// Output the redline item set
m_rExport.OutputItemSet( *pChangesSet, true, false,
i18n::ScriptType::LATIN, m_rExport.mbExportModeRTF );
@@ -2396,7 +2394,7 @@ void DocxAttributeOutput::Redline( const SwRedlineData*
pRedlineData)
WriteCollectedParagraphProperties();
// Revert back the original values that were stored in
'm_rExport.SdrExporter().getFlyAttrList()', 'm_pParagraphSpacingAttrList'
-
m_rExport.SdrExporter().setFlyAttrList(pFlyAttrList_Original);
+
m_rExport.SdrExporter().getFlyAttrList().reset(pFlyAttrList_Original.release());
m_pParagraphSpacingAttrList.reset(pParagraphSpacingAttrList_Original.release());
m_pSerializer->endElementNS( XML_w, XML_pPr );
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx
b/sw/source/filter/ww8/docxsdrexport.cxx
index 142e79c..a642b17 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -132,7 +132,7 @@ struct DocxSdrExport::Impl
const Size* m_pFlyFrameSize;
bool m_bTextFrameSyntax;
bool m_bDMLTextFrameSyntax;
-sax_fastparser::FastAttributeList* m_pFlyAttrList;
+std::unique_ptr m_pFlyAttrList;
sax_fastparser::FastAttributeList* m_pTextboxAttrList;
OStringBuffer m_aTextFrameStyle;
bool m_bFrameBtLr;
@@ -160,7 +160,6 @@ struct DocxSdrExport::Impl
m_pFlyFrameSize(0),
m_bTextFrameSyntax(false),
m_bDMLTextFrameSyntax(false),
- m_pFlyAttrList(0),
m_pTextboxAttrList(0),
m_bFrameBtLr(false),
m_bDrawingOpen(false),
@@ -181,7 +180,6 @@ struct DocxSdrExport::Impl
~Impl()
{
-delete m_pFlyAttrList, m_pFlyAttrList = NULL;
delete m_pTextboxAttrList, m_pTextboxAttrList = NULL;
}
@@ -220,16 +218,11 @@ bool DocxSdrExport::getDMLTextFrameSyntax()
return m_pImpl->m_bDMLTextFrameSyntax;
}
-sax_fastparser::FastAttributeList*& DocxSdrExport::getFlyAttrList()
+std::unique_ptr&
DocxSdrExport::getFlyAttrList()
{
return m_pImpl->m_pFlyAttrList;
}
-void DocxSdrExport::setFlyAttrList(sax_fastparser::FastAttributeList*
pAttrList)
-{
-m_pImpl->m_pFlyAttrList = pAttrList;
-}
-
sax_fastparser::FastAttributeList* DocxSdrExport::getTextboxAttrList()
{
return m_pImpl->m_pTextboxAttrList;
@@ -1592,7 +1585,7 @@ void DocxSdrExport::writeVMLTextFrame(sw::Frame*
pParentFrame, bool bTextBoxOnly
m_pImpl->m_pFlyFrameSize = &aSize;
m_pImpl->m_bTextFrameSyntax = true;
-m_pImpl->m_pFlyAttrList = pFS->createAttrList();
+m_pImpl->m_pFlyAttrList.re
[Libreoffice-commits] core.git: sw/qa sw/source
sw/qa/extras/ww8import/data/fdo68963.doc |binary
sw/qa/extras/ww8import/ww8import.cxx |2 ++
sw/source/core/crsr/crossrefbookmark.cxx |2 +-
sw/source/filter/ww8/ww8par5.cxx | 11 ++-
4 files changed, 13 insertions(+), 2 deletions(-)
New commits:
commit 2ad285eacda91bb95ec2fbb44ce6fa0b4d50f817
Author: Justin Luth
Date: Tue Mar 10 10:15:44 2015 +0300
tdf#89482 fix __refheading__ regression, set only CrossRefs as TOC.
bugfix tdf#68963 marked all __refheading__ bookmarks at TOC, but
those crossreferences were deleted if they are not recorded in
aReferencedTOCBookmarks. Redesigned the fix to include _Toc in the
crossreference name that is auto-generated, which is how MSWord
differentiates the markers.
Updated the test document to include even more combinations of
cross-references and numbered heading references.
Change-Id: I3d60d2b528ebfa1ffb108bbfc9e7db2c604af49b
Reviewed-on: https://gerrit.libreoffice.org/14822
Tested-by: Jenkins
Reviewed-by: Miklos Vajna
diff --git a/sw/qa/extras/ww8import/data/fdo68963.doc
b/sw/qa/extras/ww8import/data/fdo68963.doc
index 4b331f0..b31741f 100644
Binary files a/sw/qa/extras/ww8import/data/fdo68963.doc and
b/sw/qa/extras/ww8import/data/fdo68963.doc differ
diff --git a/sw/qa/extras/ww8import/ww8import.cxx
b/sw/qa/extras/ww8import/ww8import.cxx
index 8ba9466..0c0da88 100644
--- a/sw/qa/extras/ww8import/ww8import.cxx
+++ b/sw/qa/extras/ww8import/ww8import.cxx
@@ -521,6 +521,8 @@ DECLARE_WW8IMPORT_TEST(testfdo68963, "fdo68963.doc")
// The problem was that the text was not displayed.
CPPUNIT_ASSERT (
!parseDump("/root/page/body/tab/row[2]/cell[1]/txt/Special", "rText").isEmpty()
);
CPPUNIT_ASSERT_EQUAL( OUString("Topic 1"),
parseDump("/root/page/body/tab/row[2]/cell[1]/txt/Special", "rText") );
+// all crossreference bookmarks should have a target. Shouldn't be any
"Reference source not found" in the xml
+CPPUNIT_ASSERT ( -1 ==
parseDump("/root/page/body/txt[24]/Special[2]","rText").indexOf("Reference
source not found"));
}
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/core/crsr/crossrefbookmark.cxx
b/sw/source/core/crsr/crossrefbookmark.cxx
index 700a3f2..67a25d0 100644
--- a/sw/source/core/crsr/crossrefbookmark.cxx
+++ b/sw/source/core/crsr/crossrefbookmark.cxx
@@ -72,7 +72,7 @@ namespace sw { namespace mark
const vcl::KeyCode& rCode,
const OUString& rName,
const OUString& rShortName)
-: CrossRefBookmark(rPaM, rCode, rName, rShortName,
IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix())
+: CrossRefBookmark(rPaM, rCode, rName, rShortName,
IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix()+"_Toc")
{ }
bool CrossRefHeadingBookmark::IsLegalName(const OUString& rName)
diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx
index 555413a..5e48540 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -101,7 +101,7 @@ namespace
// #120879# - helper method to identify a bookmark name to match the
internal TOC bookmark naming convention
bool IsTOCBookmarkName(const OUString& rName)
{
-return rName.startsWith("_Toc") ||
rName.startsWith(IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix());
+return rName.startsWith("_Toc") ||
rName.startsWith(IDocumentMarkAccess::GetCrossRefHeadingBookmarkNamePrefix()+"_Toc");
}
OUString EnsureTOCBookmarkName(const OUString& rName)
@@ -1969,6 +1969,15 @@ eF_ResT SwWW8ImplReader::Read_F_Ref( WW8FieldDesc*,
OUString& rStr )
OUString sBkmName(GetMappedBookmark(sOrigBkmName));
+// #i120879# add cross reference bookmark name prefix, if it
+// matches internal TOC bookmark naming convention
+if ( IsTOCBookmarkName( sBkmName ) )
+{
+sBkmName = EnsureTOCBookmarkName(sBkmName);
+// track as referenced TOC bookmark.
+pReffedStck->aReferencedTOCBookmarks.insert( sBkmName );
+}
+
SwGetRefField aFld(
static_cast(rDoc.getIDocumentFieldsAccess().GetSysFldType(
RES_GETREFFLD )),
sBkmName,REF_BOOKMARK,0,eFormat);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Unable to build libre office
Hi, On Sat, Mar 14, 2015 at 10:42:57AM +0530, Anjali Shally wrote: > Hi, > My name is Anjali.I am applying for GSOC this time.While building libre > office am getting the following error when running make command: > make: *** [../libreoffice/workdir/download] Error 1 This is only the last line and it is useless for a diagnose. There should have been a failed command up the output list, which would point to the problem. What happens if you re-run make? D. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.
https://bugs.documentfoundation.org/show_bug.cgi?id=43157 --- Comment #37 from Commit Notification --- Stephan Bergmann committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=36aafefc064cf5d5df51b7ca7bcc7e2256cefd69 tdf#43157: Fix format string violations in OSL_TRACE etc. (Mac OS X) It will be available in 4.5.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Bug 43157] Clean up OSL_ASSERT, DBG_ASSERT, etc.
https://bugs.documentfoundation.org/show_bug.cgi?id=43157 --- Comment #38 from Commit Notification --- Stephan Bergmann committed a patch related to this issue. It has been pushed to "master": http://cgit.freedesktop.org/libreoffice/core/commit/?id=7196df7ac616be39689f21d8784fd78030868586 tdf#43157: Enable format check in sal_detail_logFormat It will be available in 4.5.0. The patch should be included in the daily builds available at http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More information about daily builds can be found at: http://wiki.documentfoundation.org/Testing_Daily_Builds Affected users are encouraged to test the fix and report feedback. -- You are receiving this mail because: You are on the CC list for the bug. ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 2 commits - fpicker/source include/sal
fpicker/source/aqua/SalAquaFilePicker.mm |2 +-
fpicker/source/aqua/SalAquaFolderPicker.mm |2 +-
fpicker/source/aqua/SalAquaPicker.mm |2 +-
include/sal/detail/log.h |2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 7196df7ac616be39689f21d8784fd78030868586
Author: Stephan Bergmann
Date: Fri Mar 13 18:23:25 2015 +0100
tdf#43157: Enable format check in sal_detail_logFormat
Change-Id: I65296dd9b4b13fc1c3a3d8eed738e257b204b691
diff --git a/include/sal/detail/log.h b/include/sal/detail/log.h
index bd44cda..8dee501 100644
--- a/include/sal/detail/log.h
+++ b/include/sal/detail/log.h
@@ -60,7 +60,7 @@ SAL_DLLPUBLIC void SAL_CALL sal_detail_logFormat(
enum sal_detail_LogLevel level, char const * area, char const * where,
char const * format, ...)
/* TODO: enabling this will produce a huge amount of -Werror=format errors: */
-#if defined __GNUC__ && 0
+#if defined __GNUC__
__attribute__((format(printf, 4, 5)))
#endif
;
commit 36aafefc064cf5d5df51b7ca7bcc7e2256cefd69
Author: Stephan Bergmann
Date: Sat Mar 14 09:23:43 2015 +0100
tdf#43157: Fix format string violations in OSL_TRACE etc. (Mac OS X)
Change-Id: Iab8c97560a9c46638d3943c2e129ddcf2e9db603
diff --git a/fpicker/source/aqua/SalAquaFilePicker.mm
b/fpicker/source/aqua/SalAquaFilePicker.mm
index 11e5ee6..1e0a658 100644
--- a/fpicker/source/aqua/SalAquaFilePicker.mm
+++ b/fpicker/source/aqua/SalAquaFilePicker.mm
@@ -333,7 +333,7 @@ uno::Sequence SAL_CALL
SalAquaFilePicker::getFiles() throw( uno::
}
long nFiles = [files count];
-OSL_TRACE("# of items: %d", nFiles);
+SAL_INFO("fpicker.aqua", "# of items: " << nFiles);
uno::Sequence< rtl::OUString > aSelectedFiles(nFiles > 1 ? nFiles + 1 :
nFiles);
diff --git a/fpicker/source/aqua/SalAquaFolderPicker.mm
b/fpicker/source/aqua/SalAquaFolderPicker.mm
index 76cdb53..a597913 100644
--- a/fpicker/source/aqua/SalAquaFolderPicker.mm
+++ b/fpicker/source/aqua/SalAquaFolderPicker.mm
@@ -178,7 +178,7 @@ rtl::OUString SAL_CALL SalAquaFolderPicker::getDirectory()
throw( uno::RuntimeEx
}
long nFiles = [files count];
-OSL_TRACE("# of items: %d", nFiles);
+SAL_INFO("fpicker.aqua", "# of items: " << nFiles);
if (nFiles < 1) {
throw uno::RuntimeException("no directory selected", static_cast<
cppu::OWeakObject * >( this ));
diff --git a/fpicker/source/aqua/SalAquaPicker.mm
b/fpicker/source/aqua/SalAquaPicker.mm
index 6fd4023..e45a37e 100644
--- a/fpicker/source/aqua/SalAquaPicker.mm
+++ b/fpicker/source/aqua/SalAquaPicker.mm
@@ -169,7 +169,7 @@ int SalAquaPicker::run()
NSString *temp = [NSString stringWithOUString:m_sDisplayDirectory];
startDirectory = [NSURL URLWithString:temp];
-OSL_TRACE("start dir: %s", [startDirectory path]);
+SAL_INFO("fpicker.aqua", "start dir: " << [startDirectory path]);
}
else {
startDirectory = [NSURL fileURLWithPath:NSHomeDirectory()
isDirectory:YES];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
