LibreOffice Gerrit News for core on 2014-08-22
Moin! * Open changes on master for project core changed in the last 25 hours: First time contributors doing great things! + disable OpenGL for OS X 10.5 in https://gerrit.libreoffice.org/11061 from Douglas Mencken about module build + Replace the whole content for copied documents in https://gerrit.libreoffice.org/10963 from Jan-Marek Glogowski about module sw End of freshness + fdo#81956 : Rendering of vml group shape was wrong. in https://gerrit.libreoffice.org/11013 from sushil_shinde about module sw, writerfilter + bnc#880448: Improved handling of placeholder shapes in https://gerrit.libreoffice.org/11052 from Matúš Kukan about module oox + fdo#56456 fdo#75578 fdo#63271 fdo#75805 Improve hyperlink dialog in https://gerrit.libreoffice.org/10946 from Thomas Arnhold about module cui * Merged changes on master for project core changed in the last 25 hours: + jvmfwk: Removes the checking for W98 in JREProperties.java in https://gerrit.libreoffice.org/11054 from Robert Antoni Buj i Gelonch + Resolves: fdo#79172 dev builds were misleadingly labeled 'beta' in https://gerrit.libreoffice.org/10313 from Adolfo Jayme Barrientos + fdo#80367 (part) help pages fo Calc XML source in https://gerrit.libreoffice.org/11055 from Olivier Hallot + wizards: Enhancements in JavaTools.java in https://gerrit.libreoffice.org/11049 from Robert Antoni Buj i Gelonch + Remove useless include tools/debug.hxx from forms and extensions in https://gerrit.libreoffice.org/11012 from Marcos Paulo de Souza + wizards: EffectiveMax EffectiveMin of TINYINT in https://gerrit.libreoffice.org/11044 from Robert Antoni Buj i Gelonch * Abandoned changes on master for project core changed in the last 25 hours: + Remove History navigation feature in https://gerrit.libreoffice.org/10551 from Samuel Mehrbrodt * Open changes needing tweaks, but being untouched for more than a week: + fdo#81426 : Data from header and footer is getting lost. in https://gerrit.libreoffice.org/10531 from Rajashri Udhoji + fdo#79541 :Corrupt: Shape enclosed within a floating table in https://gerrit.libreoffice.org/9914 from Rajashri Udhoji + fdo#63154: Rearrange some solar.h includes in https://gerrit.libreoffice.org/10892 from Marcos Paulo de Souza + VS2013: Make 64 bit shell extensions optional in https://gerrit.libreoffice.org/10163 from David Ostrovsky + fdo#82290: Perform write(2) and read(2) concurrently to avoid pipe deadlo in https://gerrit.libreoffice.org/10825 from Jan Holesovsky + fdo#80996:Fix for DataLabel not preserved for ColumnChart after RT in https://gerrit.libreoffice.org/10169 from Dushyant Bhalgami + fdo#79018: LO hangs while opening file. in https://gerrit.libreoffice.org/9564 from Yogesh Bharate + Use assert instead of OSL_ASSERT in sal/ in https://gerrit.libreoffice.org/10113 from Arnaud Versini + fdo#77716 : Paragraph spacing is not preserved after RT. in https://gerrit.libreoffice.org/9197 from Tushar Bende + fdo#77121 Header / Footer positions not preserved after RT in https://gerrit.libreoffice.org/9235 from Priyanka Gaikwad Best, Your friendly LibreOffice Gerrit Digest Mailer Note: The bot generating this message can be found and improved here: https://gerrit.libreoffice.org/gitweb?p=dev-tools.git;a=blob;f=gerritbot/send-daily-digest ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sfx2/source
sfx2/source/doc/objstor.cxx | 16
sfx2/source/doc/objxtor.cxx | 14 ++
sfx2/source/inc/objshimp.hxx |5 +++--
3 files changed, 17 insertions(+), 18 deletions(-)
New commits:
commit 8a08ddd7371024db9a0cb901e956b5ba4bd40a06
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 22 08:50:56 2014 +0200
No need to own SfxBasicManagerHolder by pointer in SfxObjectShell_Impl
Change-Id: I55da464ef1d3381fb51949a349f844dbd7da49eb
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 7de5349..6e8b659 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1060,13 +1060,13 @@ bool SfxObjectShell::DoSave()
GetBasicManager();
// disconnect from the current storage
-pImp-pBasicManager-setStorage( xTmpStorage );
+pImp-aBasicManager.setStorage( xTmpStorage );
// store to the current storage
-pImp-pBasicManager-storeLibrariesToStorage(
GetMedium()-GetStorage() );
+pImp-aBasicManager.storeLibrariesToStorage(
GetMedium()-GetStorage() );
// connect to the current storage back
-pImp-pBasicManager-setStorage( GetMedium()-GetStorage()
);
+pImp-aBasicManager.setStorage( GetMedium()-GetStorage()
);
}
catch( uno::Exception )
{
@@ -1858,7 +1858,7 @@ bool SfxObjectShell::ConnectTmpStorage_Impl(
if ( bResult )
{
-pImp-pBasicManager-setStorage( xTmpStorage );
+pImp-aBasicManager.setStorage( xTmpStorage );
// Get rid of this workaround after issue i113914 is fixed
try
@@ -2014,7 +2014,7 @@ bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed )
// TODO/LATER: may be this code will be replaced, but not sure
// Set storage in document library containers
-pImp-pBasicManager-setStorage( xStorage );
+pImp-aBasicManager.setStorage( xStorage );
// Get rid of this workaround after issue i113914 is fixed
try
@@ -3097,7 +3097,7 @@ bool SfxObjectShell::SaveAsOwnFormat( SfxMedium rMedium )
GetBasicManager();
// Save dialog/script container
-pImp-pBasicManager-storeLibrariesToStorage( xStorage );
+pImp-aBasicManager.storeLibrariesToStorage( xStorage );
}
#endif
return SaveAs( rMedium );
@@ -3632,12 +3632,12 @@ bool SfxObjectShell::QuerySaveSizeExceededModules_Impl(
const uno::Reference ta
if ( !HasBasic() )
return true;
-if ( !pImp-pBasicManager-isValid() )
+if ( !pImp-aBasicManager.isValid() )
GetBasicManager();
uno::Sequence OUString sModules;
if ( xHandler.is() )
{
-if( pImp-pBasicManager-LegacyPsswdBinaryLimitExceeded( sModules ) )
+if( pImp-aBasicManager.LegacyPsswdBinaryLimitExceeded( sModules ) )
{
ModuleSizeExceeded* pReq = new ModuleSizeExceeded( sModules );
uno::Reference task::XInteractionRequest xReq( pReq );
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 409ce93..2b4112b 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -205,7 +205,6 @@ TYPEINIT1(SfxObjectShell, SfxShell);
SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell _rDocShell )
:mpObjectContainer(0)
-,pBasicManager( new SfxBasicManagerHolder )
,rDocShell( _rDocShell )
,aMacroMode( *this )
,pProgress( 0)
@@ -276,7 +275,6 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell
_rDocShell )
SfxObjectShell_Impl::~SfxObjectShell_Impl()
{
-delete pBasicManager;
}
@@ -364,7 +362,7 @@ SfxObjectShell::~SfxObjectShell()
pSfxApp-ReleaseIndex(pImp-nVisualDocumentNumber);
// Destroy Basic-Manager
-pImp-pBasicManager-reset( NULL );
+pImp-aBasicManager.reset( NULL );
if ( pSfxApp-GetDdeService() )
pSfxApp-RemoveDdeTopic( this );
@@ -688,7 +686,7 @@ namespace
{
if ( !_rDocument.Get_Impl()-bBasicInitialized )
const_cast SfxObjectShell ( _rDocument
).InitBasicManager_Impl();
-return _rDocument.Get_Impl()-pBasicManager-get();
+return _rDocument.Get_Impl()-aBasicManager.get();
}
// assume we do not have Basic ourself, but we can refer to another
@@ -749,7 +747,7 @@ bool SfxObjectShell::HasBasic() const
if ( !pImp-bBasicInitialized )
const_cast SfxObjectShell* ( this )-InitBasicManager_Impl();
-return pImp-pBasicManager-isValid();
+return pImp-aBasicManager.isValid();
#endif
}
@@ -876,16 +874,16 @@ void SfxObjectShell::InitBasicManager_Impl()
Basic managers is the global BasicManagerRepository instance.
*/
#ifndef DISABLE_SCRIPTING
-
Re: OSL process.cxx question
On 2014-08-22 03:29 AM, Chris Sherlock wrote: Hi folks, In sal/osl/unx/process.cxx there is an #ifdef NO_CHILD_PROCESSES http://opengrok.libreoffice.org/xref/core/sal/osl/unx/process.cxx#207 Does anyone know what this does? Chris git grep says that's defined in sal/Library_sal.mk, and the code there says: $(if $(filter $(OS),IOS), \ -DNO_CHILD_PROCESSES \ ) \ So I'm guessing it disables fork on iOS i.e. iPhone and iPad. Disclaimer: http://www.peralex.com/disclaimer.html ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: basic/source
basic/source/basmgr/basicmanagerrepository.cxx | 17 -
1 file changed, 8 insertions(+), 9 deletions(-)
New commits:
commit 8c5834d5cb8c1511efc99ea9e22b254a337f9261
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 22 08:59:01 2014 +0200
Remove trivial typedef, to make code more obvious
Change-Id: I70017a5c6f9403520ee79e9d0864352eb1c8e100
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx
b/basic/source/basmgr/basicmanagerrepository.cxx
index 45cb468..db818ad 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -68,8 +68,7 @@ namespace basic
using ::com::sun::star::lang::XComponent;
using ::com::sun::star::document::XEmbeddedScripts;
-typedef BasicManager* BasicManagerPointer;
-typedef ::std::map Reference XInterface , BasicManagerPointer,
::comphelper::OInterfaceCompare XInterface BasicManagerStore;
+typedef ::std::map Reference XInterface , BasicManager*,
::comphelper::OInterfaceCompare XInterface BasicManagerStore;
typedef ::std::vector BasicManagerCreationListener* CreationListeners;
@@ -123,7 +122,7 @@ namespace basic
@precond
our mutex is locked
*/
-BasicManagerPointer
+BasicManager*
impl_getLocationForModel( const Reference XModel
_rxDocumentModel );
/** creates a new BasicManager instance for the given model
@@ -136,12 +135,12 @@ namespace basic
the model whose BasicManager will be created. Must not be
NULL/.
*/
void impl_createManagerForModel(
-BasicManagerPointer _out_rpBasicManager,
+BasicManager* _out_rpBasicManager,
const Reference XModel _rxDocumentModel );
/** creates the application-wide BasicManager
*/
-BasicManagerPointer impl_createApplicationBasicManager();
+BasicManager* impl_createApplicationBasicManager();
/** notifies all listeners which expressed interest in the creation of
BasicManager instances.
*/
@@ -248,7 +247,7 @@ namespace basic
thus a recursive call of this function will find and return it
without creating another instance.
*/
-BasicManagerPointer pBasicManager = impl_getLocationForModel(
_rxDocumentModel );
+BasicManager* pBasicManager = impl_getLocationForModel(
_rxDocumentModel );
if ( pBasicManager == NULL )
impl_createManagerForModel( pBasicManager, _rxDocumentModel );
@@ -379,12 +378,12 @@ namespace basic
}
-BasicManagerPointer ImplRepository::impl_getLocationForModel( const
Reference XModel _rxDocumentModel )
+BasicManager* ImplRepository::impl_getLocationForModel( const Reference
XModel _rxDocumentModel )
{
Reference XInterface xNormalized( _rxDocumentModel, UNO_QUERY );
DBG_ASSERT( _rxDocumentModel.is(),
ImplRepository::impl_getLocationForModel: invalid model! );
-BasicManagerPointer location = m_aStore[ xNormalized ];
+BasicManager* location = m_aStore[ xNormalized ];
return location;
}
@@ -415,7 +414,7 @@ namespace basic
}
-void ImplRepository::impl_createManagerForModel( BasicManagerPointer
_out_rpBasicManager, const Reference XModel _rxDocumentModel )
+void ImplRepository::impl_createManagerForModel( BasicManager*
_out_rpBasicManager, const Reference XModel _rxDocumentModel )
{
StarBASIC* pAppBasic = impl_getDefaultAppBasicLibrary();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/basmgr/basicmanagerrepository.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 72305ed49d4c9ba968d7bf6d8d5ae564bb92147d
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 22 09:03:27 2014 +0200
Simplify ImplRepository::impl_getLocationForModel return type
Change-Id: I937f96457347195ed18ddcdc75b1106840f0522e
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx
b/basic/source/basmgr/basicmanagerrepository.cxx
index db818ad..5c102c6 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -122,7 +122,7 @@ namespace basic
@precond
our mutex is locked
*/
-BasicManager*
+BasicManager*
impl_getLocationForModel( const Reference XModel
_rxDocumentModel );
/** creates a new BasicManager instance for the given model
@@ -247,7 +247,7 @@ namespace basic
thus a recursive call of this function will find and return it
without creating another instance.
*/
-BasicManager* pBasicManager = impl_getLocationForModel(
_rxDocumentModel );
+BasicManager* pBasicManager = impl_getLocationForModel(
_rxDocumentModel );
if ( pBasicManager == NULL )
impl_createManagerForModel( pBasicManager, _rxDocumentModel );
@@ -378,12 +378,12 @@ namespace basic
}
-BasicManager* ImplRepository::impl_getLocationForModel( const Reference
XModel _rxDocumentModel )
+BasicManager* ImplRepository::impl_getLocationForModel( const Reference
XModel _rxDocumentModel )
{
Reference XInterface xNormalized( _rxDocumentModel, UNO_QUERY );
DBG_ASSERT( _rxDocumentModel.is(),
ImplRepository::impl_getLocationForModel: invalid model! );
-BasicManager* location = m_aStore[ xNormalized ];
+BasicManager* location = m_aStore[ xNormalized ];
return location;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source include/basic
basic/source/basmgr/basicmanagerrepository.cxx | 22 --
include/basic/basmgr.hxx |4 ++--
2 files changed, 6 insertions(+), 20 deletions(-)
New commits:
commit 73b2ea1dfa32566f9f94d5d6e7919ba7d13f6f2c
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 22 09:06:55 2014 +0200
Remove BasicManagerCleaner
Change-Id: I55eccc6367cf3255af05c075631945f47417d682
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx
b/basic/source/basmgr/basicmanagerrepository.cxx
index 5c102c6..a292ccc 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -72,21 +72,6 @@ namespace basic
typedef ::std::vector BasicManagerCreationListener* CreationListeners;
-
-//= BasicManagerCleaner
-
-/// is the only instance which is allowed to delete a BasicManager instance
-class BasicManagerCleaner
-{
-public:
-static void deleteBasicManager( BasicManager* _rpManager )
-{
-delete _rpManager;
-_rpManager = NULL;
-}
-};
-
-
//= ImplRepository
class ImplRepository : public ::utl::OEventListenerAdapter, public
SfxListener
@@ -272,7 +257,7 @@ namespace basic
::osl::MutexGuard aGuard( m_aMutex );
BasicManager* pPreviousManager = getApplicationBasicManager( false );
-BasicManagerCleaner::deleteBasicManager( pPreviousManager );
+delete pPreviousManager;
GetSbData()-pAppBasMgr = _pBasicManager;
}
@@ -453,7 +438,8 @@ namespace basic
if ( ERRCODE_BUTTON_CANCEL == ErrorHandler::HandleError(
i-GetErrorId() ) )
{
// user wants to break loading of BASIC-manager
-BasicManagerCleaner::deleteBasicManager(
_out_rpBasicManager );
+delete _out_rpBasicManager;
+_out_rpBasicManager = NULL;
xStorage.clear();
break;
}
@@ -550,7 +536,7 @@ namespace basic
// *then* delete the BasicManager
EndListening( *pManager );
-BasicManagerCleaner::deleteBasicManager( pManager );
+delete pManager;
}
diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx
index 29336da..d6a93d7 100644
--- a/include/basic/basmgr.hxx
+++ b/include/basic/basmgr.hxx
@@ -67,7 +67,7 @@ class BasicLibs;
class ErrorManager;
class BasicLibInfo;
-namespace basic { class BasicManagerCleaner; }
+namespace basic { class ImplRepository; }
// Library password handling for 5.0 documents
class BASIC_DLLPUBLIC OldBasicPassword
@@ -115,7 +115,7 @@ class BASIC_DLLPUBLIC BasicManager : public SfxBroadcaster
friend class LibraryContainer_Impl;
friend class StarBasicAccess_Impl;
friend class BasMgrContainerListenerImpl;
-friend class ::basic::BasicManagerCleaner;
+friend class ::basic::ImplRepository;
private:
BasicLibs* pLibs;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: basic/source
basic/source/basmgr/basicmanagerrepository.cxx |8
1 file changed, 4 insertions(+), 4 deletions(-)
New commits:
commit c319ccfc37ee6d05e08227799045ff26ea985432
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 22 09:10:40 2014 +0200
Revert Simplify ImplRepository::impl_getLocationForModel return type
This reverts commit 72305ed49d4c9ba968d7bf6d8d5ae564bb92147d, which was
bogus,
cf. the comment in ImplRepository::getDocumentBasicManager about recursive
calls.
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx
b/basic/source/basmgr/basicmanagerrepository.cxx
index a292ccc..bcf0855 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -107,7 +107,7 @@ namespace basic
@precond
our mutex is locked
*/
-BasicManager*
+BasicManager*
impl_getLocationForModel( const Reference XModel
_rxDocumentModel );
/** creates a new BasicManager instance for the given model
@@ -232,7 +232,7 @@ namespace basic
thus a recursive call of this function will find and return it
without creating another instance.
*/
-BasicManager* pBasicManager = impl_getLocationForModel(
_rxDocumentModel );
+BasicManager* pBasicManager = impl_getLocationForModel(
_rxDocumentModel );
if ( pBasicManager == NULL )
impl_createManagerForModel( pBasicManager, _rxDocumentModel );
@@ -363,12 +363,12 @@ namespace basic
}
-BasicManager* ImplRepository::impl_getLocationForModel( const Reference
XModel _rxDocumentModel )
+BasicManager* ImplRepository::impl_getLocationForModel( const Reference
XModel _rxDocumentModel )
{
Reference XInterface xNormalized( _rxDocumentModel, UNO_QUERY );
DBG_ASSERT( _rxDocumentModel.is(),
ImplRepository::impl_getLocationForModel: invalid model! );
-BasicManager* location = m_aStore[ xNormalized ];
+BasicManager* location = m_aStore[ xNormalized ];
return location;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: unusedcode.easy
unusedcode.easy |1 - 1 file changed, 1 deletion(-) New commits: commit 822adae78fa1e9094005939bda4746e681dbb5f7 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 22 08:44:01 2014 +0100 callcatcher: update unused code Change-Id: If79676a1b160ac37faecad6070a9fb2ba3cc128f diff --git a/unusedcode.easy b/unusedcode.easy index a79e652..4e5facb 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,4 +1,3 @@ -(anonymous namespace)::flagToString(unsigned short) BigInt::BigInt(unsigned int) CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const) DocxSdrExport::isParagraphSdtOpen() ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart_opengl_window' - chart2/source
chart2/source/controller/main/ChartWindow.cxx | 16
chart2/source/view/main/ChartView.cxx |1 +
2 files changed, 17 insertions(+)
New commits:
commit d4a6f8a96a4521bc8395fd8d639727e7b5cbc665
Author: Zolnai Tamás tamas.zol...@collabora.com
Date: Fri Aug 22 10:08:07 2014 +0200
Update chart when chart type is changed in edit mode
Regression to master.
In long term it would be better to define ChartWindow as an
OpenGL window and not creating a new window inside the chart
window, becasue otherwise all events which was handled well
by the chart window will be broken (catched by the OpenGL
window so no effect on ChartWindow (defining the behavior of
charts in general) or catched by the ChartWindow and so no
effect on the OpenGLWindow (like invalidating in this case).
Change-Id: I234f469f70914e01f030c8edae9cb5aacea112bf
diff --git a/chart2/source/controller/main/ChartWindow.cxx
b/chart2/source/controller/main/ChartWindow.cxx
index dde5006..fc0aab9 100644
--- a/chart2/source/controller/main/ChartWindow.cxx
+++ b/chart2/source/controller/main/ChartWindow.cxx
@@ -265,24 +265,40 @@ void ChartWindow::adjustHighContrastMode()
void ChartWindow::ForceInvalidate()
{
::Window::Invalidate();
+if(m_pOpenGLWindow)
+{
+m_pOpenGLWindow-Invalidate();
+}
}
void ChartWindow::Invalidate( sal_uInt16 nFlags )
{
if( m_bInPaint ) // #i101928# superfluous paint calls while entering and
editing charts
return;
::Window::Invalidate( nFlags );
+if(m_pOpenGLWindow)
+{
+m_pOpenGLWindow-Invalidate( nFlags );
+}
}
void ChartWindow::Invalidate( const Rectangle rRect, sal_uInt16 nFlags )
{
if( m_bInPaint ) // #i101928# superfluous paint calls while entering and
editing charts
return;
::Window::Invalidate( rRect, nFlags );
+if(m_pOpenGLWindow)
+{
+m_pOpenGLWindow-Invalidate( rRect, nFlags );
+}
}
void ChartWindow::Invalidate( const Region rRegion, sal_uInt16 nFlags )
{
if( m_bInPaint ) // #i101928# superfluous paint calls while entering and
editing charts
return;
::Window::Invalidate( rRegion, nFlags );
+if(m_pOpenGLWindow)
+{
+m_pOpenGLWindow-Invalidate( rRegion, nFlags );
+}
}
} //namespace chart
diff --git a/chart2/source/view/main/ChartView.cxx
b/chart2/source/view/main/ChartView.cxx
index fa7f415..07e6c281 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -164,6 +164,7 @@ GL2DRenderer::~GL2DRenderer()
void GL2DRenderer::update()
{
+mpView-update();
mpView-render();
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - sw/source xmlsecurity/source
sw/source/ui/dialog/uiregionsw.cxx |5 ++---
sw/source/ui/misc/glossary.cxx |9 +
sw/source/ui/misc/glossary.src |6 ++
sw/source/uibase/dialog/regionsw.hrc |2 +-
sw/source/uibase/dialog/regionsw.src |6 ++
sw/source/uibase/inc/misc.hrc |4 ++--
sw/source/uibase/uiview/view.hrc |4 +---
sw/source/uibase/uiview/view.src |6 ++
sw/source/uibase/uiview/viewling.cxx |2 +-
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx |5 ++---
xmlsecurity/source/dialogs/digitalsignaturesdialog.hrc |2 +-
xmlsecurity/source/dialogs/digitalsignaturesdialog.src |6 ++
12 files changed, 23 insertions(+), 34 deletions(-)
New commits:
commit c70f22b9a56d19efa58329dcd5095804d1864513
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 22 09:33:44 2014 +0100
QueryBox STR_QUERY_DELETE - MessageDialog + string
Change-Id: I570fe82f3207e8b40a0e4727c6641fdf59113978
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 0e83851..33d8984 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -20,7 +20,7 @@
#include hintids.hxx
#include vcl/menu.hxx
-#include vcl/msgbox.hxx
+#include vcl/layout.hxx
#include vcl/help.hxx
#include svl/stritem.hxx
#include unotools/pathoptions.hxx
@@ -488,8 +488,8 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn )
}
else if (sItemIdent == delete)
{
-QueryBox aQuery(this, SW_RES(MSG_QUERY_DELETE));
-if(RET_YES == aQuery.Execute())
+MessageDialog aQuery(this, SW_RES(STR_QUERY_DELETE),
VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO);
+if (RET_YES == aQuery.Execute())
{
const OUString aShortName(m_pShortNameEdit-GetText());
const OUString aTitle(m_pNameED-GetText());
@@ -646,7 +646,8 @@ IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl)
}
else
{
-QueryBox aBox(this, WB_YES_NO, sReadonlyPath);
+MessageDialog aBox(this, sReadonlyPath, VCL_MESSAGE_QUESTION,
VCL_BUTTONS_YES_NO);
+
if(RET_YES == aBox.Execute())
PathHdl(m_pPathBtn);
}
diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src
index 28d8f5b..7d44cdf 100644
--- a/sw/source/ui/misc/glossary.src
+++ b/sw/source/ui/misc/glossary.src
@@ -26,11 +26,9 @@ String STR_DOUBLE_SHORTNAME
{
Text [ en-US ] = Shortcut name already exists. Please choose another
name. ;
};
-QueryBox MSG_QUERY_DELETE
+String STR_QUERY_DELETE
{
-BUTTONS = WB_YES_NO ;
-DEFBUTTON = WB_DEF_NO ;
-Message [ en-US ] = Delete AutoText? ;
+Text[ en-US ] = Delete AutoText? ;
};
String STR_QUERY_DELETE_GROUP1
{
diff --git a/sw/source/uibase/inc/misc.hrc b/sw/source/uibase/inc/misc.hrc
index 01e1e3d..03f944f 100644
--- a/sw/source/uibase/inc/misc.hrc
+++ b/sw/source/uibase/inc/misc.hrc
@@ -26,10 +26,10 @@
#define DLG_SORTING (RC_MISC_BEGIN + 19)
-#define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 31)
+#define DLG_TAB_OUTLINE (RC_MISC_BEGIN + 29)
#define STR_DOUBLE_SHORTNAME(RC_MISC_BEGIN + 30)
-#define MSG_QUERY_DELETE(RC_MISC_BEGIN + 31)
+#define STR_QUERY_DELETE(RC_MISC_BEGIN + 31)
#define STR_QUERY_DELETE_GROUP1 (RC_MISC_BEGIN + 32)
#define STR_QUERY_DELETE_GROUP2 (RC_MISC_BEGIN + 33)
#define STR_NO_GLOSSARIES (RC_MISC_BEGIN + 34)
commit f10e4157ce6c134bb9561b7b48254c2c566726eb
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 22 09:20:01 2014 +0100
QueryBox QB_CONNECT - MessageDialog + string
Change-Id: I593527c365ad6925229a3dd7d9e1c589fc4e34a5
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index 31b53da..14e078f 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -23,7 +23,6 @@
#include svl/PasswordHelper.hxx
#include vcl/svapp.hxx
#include vcl/layout.hxx
-#include vcl/msgbox.hxx
#include svl/stritem.hxx
#include svl/eitem.hxx
#include sfx2/passwd.hxx
@@ -961,7 +960,7 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox )
bool bContent = pSectRepr-IsContent();
if( pBox-IsChecked() bContent rSh.HasSelection() )
{
-if( RET_NO == QueryBox( this, SW_RES(QB_CONNECT) ).Execute() )
+if (RET_NO == MessageDialog(this, SW_RES(STR_QUERY_CONNECT),
VCL_MESSAGE_QUESTION, VCL_BUTTONS_YES_NO).Execute())
pBox-Check( false );
}
if( bFile )
@@ -1709,7 +1708,7 @@ IMPL_LINK( SwInsertSectionTabPage, UseFileHdl, CheckBox
*, pBox )
if( pBox-IsChecked() )
{
if( m_pWrtSh-HasSelection()
-RET_NO == QueryBox( this,
[Libreoffice-commits] core.git: Branch 'feature/orcus-continuous-integration' - 6 commits - framework/source sc/source
framework/source/loadenv/loadenv.cxx |7 -
sc/source/filter/inc/orcusinterface.hxx| 91 ++
sc/source/filter/oox/worksheetfragment.cxx |2
sc/source/filter/orcus/interface.cxx | 143 ++---
4 files changed, 207 insertions(+), 36 deletions(-)
New commits:
commit 20d8e5237b90ceffe03f4e010030c9afc17b6bd5
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri Aug 22 11:22:03 2014 +0200
remove crazy whitespaces
Change-Id: Ia104e5dedbaf19dff5b0eaf4eb6f4c355570cc00
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index 49cd13b..d9cfbda 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1079,9 +1079,9 @@ bool LoadEnv::impl_loadContent()
// So we prevent our code against wrong using. Why?
// It could be, that using of this progress could make trouble. e.g. He
make window visible ...
// but shouldn't do that. But if no indicator is available ... nobody has
a chance to do that!
-bool bHidden=
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN()
, sal_False );
-bool bMinimized =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED()
, sal_False );
-bool bPreview =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW()
, sal_False );
+bool bHidden=
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(),
sal_False);
+bool bMinimized =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED(),
sal_False);
+bool bPreview =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW(),
sal_False);
css::uno::Reference css::task::XStatusIndicator xProgress =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR(),
css::uno::Reference css::task::XStatusIndicator ());
if (!bHidden !bMinimized !bPreview !xProgress.is())
commit 4e113d9c2fb8dc7fe48a779caf4368664d1218b0
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri Aug 22 11:21:44 2014 +0200
make experimental orcus import work again
Change-Id: I2e599331669c3018557835ab227395c54c247ac9
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index 1616d3b..49cd13b 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -762,6 +762,7 @@ void LoadEnv::impl_detectTypeAndFilter()
m_lMediaDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] = sType;
m_lMediaDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] =
sFilter;
m_lMediaDescriptor[utl::MediaDescriptor::PROP_FILTERPROVIDER()] =
OUString(orcus);
+m_lMediaDescriptor[utl::MediaDescriptor::PROP_DOCUMENTSERVICE()] =
OUString(com.sun.star.sheet.SpreadsheetDocument);
return;
}
commit 5532df4e35e2f39b777baf0f4e21cd7ed2812d61
Author: Markus Mohrhard markus.mohrh...@collabora.co.uk
Date: Fri Aug 22 09:03:42 2014 +0200
tep for correct styles import from orcus
Change-Id: Ifdd4686b5fd8a00dbe8ff74400a909697895e30b
diff --git a/sc/source/filter/inc/orcusinterface.hxx
b/sc/source/filter/inc/orcusinterface.hxx
index a124ea8..81e36e0 100644
--- a/sc/source/filter/inc/orcusinterface.hxx
+++ b/sc/source/filter/inc/orcusinterface.hxx
@@ -13,6 +13,8 @@
#include address.hxx
#include documentimport.hxx
+#include tools/color.hxx
+
#include sharedformulagroups.hxx
#include rtl/strbuf.hxx
@@ -24,6 +26,7 @@
#include boost/unordered_map.hpp
#include map
+#include vector
class ScDocumentImport;
class ScOrcusSheet;
@@ -154,6 +157,85 @@ public:
class ScOrcusStyles : public orcus::spreadsheet::iface::import_styles
{
+private:
+
+struct font
+{
+bool mbBold;
+bool mbItalic;
+OUString maName;
+double mnSize;
+Color maColor;
+
+font();
+};
+
+font maCurrentFont;
+std::vectorfont maFonts;
+
+struct fill
+{
+OUString maPattern;
+Color maFgColor;
+Color maBgColor;
+};
+
+fill maCurrentFill;
+std::vectorfill maFills;
+
+struct border
+{
+
+border();
+};
+
+border maCurrentBorder;
+std::vectorborder maBorders;
+
+struct protection
+{
+bool mbHidden;
+bool mbLocked;
+
+protection();
+};
+
+protection maCurrentProtection;
+std::vectorprotection maProtections;
+
+struct number_format
+{
+OUString maCode;
+};
+
+number_format maCurrentNumberFormat;
+
[Libreoffice-commits] core.git: oox/source
oox/source/ppt/pptshape.cxx| 39 +
oox/source/ppt/pptshapecontext.cxx |5 ++--
2 files changed, 26 insertions(+), 18 deletions(-)
New commits:
commit 2a7119021edea8346e4673d57cac3f051a5d0968
Author: Matúš Kukan matus.ku...@collabora.com
Date: Tue Aug 19 16:26:12 2014 +0200
bnc#880448: Improved handling of placeholder shapes
If subTitle placeholder is not found, try body instead of title.
And use body text styles instead of title, for subTitle.
Also improve PPTShape::findPlaceholder to find placeholder
with just nSecondSubType type without the same index.
Change-Id: I470e7268088eb989fb934007dfcf704f67d8cb1d
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index cca5e37..d026128 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -90,12 +90,10 @@ oox::drawingml::TextListStylePtr
PPTShape::getSubTypeTextListStyle( const SlideP
{
case XML_ctrTitle :
case XML_title :
-case XML_subTitle :
pTextListStyle = rSlidePersist.getMasterPersist().get() ?
rSlidePersist.getMasterPersist()-getTitleTextStyle() :
rSlidePersist.getTitleTextStyle();
break;
+case XML_subTitle :
case XML_obj :
-pTextListStyle = rSlidePersist.getMasterPersist().get() ?
rSlidePersist.getMasterPersist()-getBodyTextStyle() :
rSlidePersist.getBodyTextStyle();
-break;
case XML_body :
if ( rSlidePersist.isNotesPage() )
pTextListStyle = rSlidePersist.getMasterPersist().get() ?
rSlidePersist.getMasterPersist()-getNotesTextStyle() :
rSlidePersist.getNotesTextStyle();
@@ -149,6 +147,7 @@ void PPTShape::addShape(
sServiceName = OUString();
else {
sServiceName =
com.sun.star.presentation.SubtitleShape;
+aMasterTextListStyle =
rSlidePersist.getMasterPersist().get() ?
rSlidePersist.getMasterPersist()-getBodyTextStyle() :
rSlidePersist.getBodyTextStyle();
}
}
break;
@@ -391,7 +390,8 @@ namespace
// 1. ph with nFirstSubType and the same oSubTypeIndex
// 2. ph with nFirstSubType
// 3. ph with nSecondSubType and the same oSubTypeIndex
-// 4. ph with the same oSubTypeIndex
+// 4. ph with nSecondSubType
+// 5. ph with the same oSubTypeIndex
oox::drawingml::ShapePtr PPTShape::findPlaceholder( sal_Int32 nFirstSubType,
sal_Int32 nSecondSubType,
const OptValue sal_Int32 oSubTypeIndex, std::vector
oox::drawingml::ShapePtr rShapes, bool bMasterOnly )
{
@@ -399,6 +399,7 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholder(
sal_Int32 nFirstSubType, sal
oox::drawingml::ShapePtr aChoiceShapePtr1;
oox::drawingml::ShapePtr aChoiceShapePtr2;
oox::drawingml::ShapePtr aChoiceShapePtr3;
+oox::drawingml::ShapePtr aChoiceShapePtr4;
std::vector oox::drawingml::ShapePtr ::reverse_iterator aRevIter(
rShapes.rbegin() );
while (aRevIter != rShapes.rend())
{
@@ -413,27 +414,31 @@ oox::drawingml::ShapePtr PPTShape::findPlaceholder(
sal_Int32 nFirstSubType, sal
}
else if ((*aRevIter)-getSubType() == nSecondSubType
!aChoiceShapePtr2.get())
aChoiceShapePtr2 = *aRevIter;
-else if (!aChoiceShapePtr3.get())
-aChoiceShapePtr3 = *aRevIter;
+else if (!aChoiceShapePtr4.get())
+aChoiceShapePtr4 = *aRevIter;
}
else if ((*aRevIter)-getSubType() == nFirstSubType
!aChoiceShapePtr1.get())
aChoiceShapePtr1 = *aRevIter;
+else if ((*aRevIter)-getSubType() == nSecondSubType
!aChoiceShapePtr3.get())
+aChoiceShapePtr3 = *aRevIter;
}
std::vector oox::drawingml::ShapePtr rChildren =
(*aRevIter)-getChildren();
-aChoiceShapePtr3 = findPlaceholder( nFirstSubType, nSecondSubType,
oSubTypeIndex, rChildren, bMasterOnly );
-if (aChoiceShapePtr3.get())
+aChoiceShapePtr4 = findPlaceholder( nFirstSubType, nSecondSubType,
oSubTypeIndex, rChildren, bMasterOnly );
+if (aChoiceShapePtr4.get())
{
-if (aChoiceShapePtr3-getSubType() == nFirstSubType)
+if (aChoiceShapePtr4-getSubType() == nFirstSubType)
{
-if (aChoiceShapePtr3-getSubTypeIndex() == oSubTypeIndex)
-aShapePtr = aChoiceShapePtr3;
+if (aChoiceShapePtr4-getSubTypeIndex() == oSubTypeIndex)
+aShapePtr = aChoiceShapePtr4;
else
-aChoiceShapePtr1 = aChoiceShapePtr3;
+aChoiceShapePtr1 = aChoiceShapePtr4;
}
-else if (aChoiceShapePtr3-getSubType() == nSecondSubType
-
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 ign_christian ign_christ...@yahoo.com changed: What|Removed |Added Depends on||82936 --- Comment #58 from ign_christian ign_christ...@yahoo.com --- Nominating Bug 82936 : reference to another sheet lost after cell dragging or cut-paste Regression introduced in 4.3.1.1, works correctly in 4.3.0.4 -- 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: svx/source
svx/source/svdraw/svdotxln.cxx | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 3584d4b47c4e6db479eee6735df8d56831d09638
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 22 11:55:42 2014 +0200
Avoid invalid downcasts
Change-Id: Iea1688213cc0ebb8fcb3d3e3c862fd31275b9b38
diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx
index 1cc6bc4..8fad6e3 100644
--- a/svx/source/svdraw/svdotxln.cxx
+++ b/svx/source/svdraw/svdotxln.cxx
@@ -248,16 +248,17 @@ bool SdrTextObj::LoadText(const OUString rFileName,
const OUString /*rFilterNa
ImpSdrObjTextLinkUserData* SdrTextObj::GetLinkUserData() const
{
-ImpSdrObjTextLinkUserData* pData=NULL;
sal_uInt16 nAnz=GetUserDataCount();
-for (sal_uInt16 nNum=nAnz; nNum0 pData==NULL;) {
+for (sal_uInt16 nNum=nAnz; nNum0;) {
nNum--;
-pData=(ImpSdrObjTextLinkUserData*)GetUserData(nNum);
-if (pData-GetInventor()!=SdrInventor ||
pData-GetId()!=SDRUSERDATA_OBJTEXTLINK) {
-pData=NULL;
+SdrObjUserData * pData=GetUserData(nNum);
+if (pData-GetInventor() == SdrInventor
+ pData-GetId() == SDRUSERDATA_OBJTEXTLINK)
+{
+return static_castImpSdrObjTextLinkUserData *(pData);
}
}
-return pData;
+return 0;
}
void SdrTextObj::ImpLinkAnmeldung()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: linguistic/source
linguistic/source/lngsvcmgr.cxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 8a4a1d285a79cc3544e1b32dad94b68982705977
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 22 11:58:51 2014 +0100
pAvailGrammarSvcs can be reset to 0 on error
e.g. java grammar checker installed and java
disabled at runtime
Change-Id: I84b0e5eeb3ef9c30e153cb5fb65e35270023cd34
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 44c5551..259dd8f 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -1152,7 +1152,7 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl()
}
}
-if (xSvc.is())
+if (xSvc.is() pAvailGrammarSvcs)
{
OUStringaImplName;
uno::Sequence sal_Int16aLanguages;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/core/tool/token.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 75aad687cb5e63a41303aea568bf68b2b5f15d31 Author: Eike Rathke er...@redhat.com Date: Fri Aug 22 12:59:47 2014 +0200 resolved fdo#82936 do not clear the 3D flag on refupdate Change-Id: I2ae1368a2ffc20e988ff3ab66590a9f98902b862 diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index 0b7df59..7e04064 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -2832,7 +2832,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( } rRef.SetAddress(aAbs, rNewPos); -rRef.SetFlag3D(b3DFlag); +if (b3DFlag) +rRef.SetFlag3D(b3DFlag); } break; case svDoubleRef: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx |4 1 file changed, 4 insertions(+) New commits: commit 6396e18f4d49c24283b170310a1892db40c128d3 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 22 12:07:33 2014 +0100 Related: rhbz#1125588 force existence of argument save area ELFv2 ABI on ppc64 optimises stack allocation (http://gcc.gnu.org/ml/gcc-patches/2013-11/msg01149.html so we're getting no argument save area This now appears to pass the simple cases and onwards to the tricky ones Change-Id: Ie56d148ebea7fcfc023cb7183bc97f09186e66b4 diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx index c047ebf..33131ea 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx @@ -114,7 +114,11 @@ static void callVirtualMethod(void * pThis, sal_uInt32 nVtableIndex, pMethod += 8 * nVtableIndex; pMethod = *((sal_uInt64 *)pMethod); +#if _CALL_ELF == 2 +typedef void (* FunctionCall )(...); +#else typedef void (* FunctionCall )( sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64 ); +#endif FunctionCall pFunc = (FunctionCall)pMethod; volatile double dret; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sd/source
sd/source/ui/view/DocumentRenderer.cxx | 33 -
1 file changed, 28 insertions(+), 5 deletions(-)
New commits:
commit 4bd844d6842becf495834bda997d2731bd49316d
Author: Eilidh McAdam eil...@lanedo.com
Date: Mon Jun 23 20:55:21 2014 +0100
Make Draw use paper size when printing - fdo#63905
Previously, Draw/Impress use the default size from the printer.
Now Draw uses the paper size (specified in page formatting).
Impress still uses the old method - not sure if this is correct
but printing handouts etc probably complicate print/paper size.
Reviewed-on: https://gerrit.libreoffice.org/9866
Reviewed-by: Matúš Kukan matus.ku...@collabora.com
Tested-by: Matúš Kukan matus.ku...@collabora.com
(cherry picked from commit 7b31e45ec7106d2cfbdbb7915d97667ba710f81c)
Conflicts:
sd/source/ui/view/DocumentRenderer.cxx
Change-Id: If90bae4ac59cd95dd50fcd8deb25fd900756193e
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index 4136e89d8..52aa9c5 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1418,7 +1418,19 @@ private:
else if (rInfo.maPageSize.Width() rInfo.maPageSize.Height())
rInfo.meOrientation = ORIENTATION_LANDSCAPE;
-const Size aPaperSize (rInfo.mpPrinter-GetPaperSize());
+// Draw should abide by specified paper size
+Size aPaperSize;
+if (mpOptions-IsDraw())
+{
+aPaperSize.setWidth(rInfo.maPageSize.Width());
+aPaperSize.setHeight(rInfo.maPageSize.Height());
+}
+else
+{
+aPaperSize.setWidth(rInfo.mpPrinter-GetPaperSize().Width());
+aPaperSize.setHeight(rInfo.mpPrinter-GetPaperSize().Height());
+}
+
if( (rInfo.meOrientation == ORIENTATION_LANDSCAPE
(aPaperSize.Width() aPaperSize.Height()))
||
@@ -1483,10 +1495,21 @@ private:
if (mpOptions-IsTime())
aInfo.msTimeDate +=
GetSdrGlobalData().GetLocaleData()-getTime( Time( Time::SYSTEM ), sal_False,
sal_False );
-aInfo.maPrintSize = aInfo.mpPrinter-GetOutputSize();
-maPrintSize = awt::Size(
-aInfo.mpPrinter-GetPaperSize().Width(),
-aInfo.mpPrinter-GetPaperSize().Height());
+
+// Draw should use specified paper size when printing
+if (mpOptions-IsDraw())
+{
+aInfo.maPrintSize = mrBase.GetDocument()-GetSdPage(0,
PK_STANDARD)-GetSize();
+maPrintSize = awt::Size(aInfo.maPrintSize.Width(),
+aInfo.maPrintSize.Height());
+}
+else
+{
+aInfo.maPrintSize = aInfo.mpPrinter-GetOutputSize();
+maPrintSize = awt::Size(
+aInfo.mpPrinter-GetPaperSize().Width(),
+aInfo.mpPrinter-GetPaperSize().Height());
+}
switch (mpOptions-GetOutputQuality())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Bug 75025] LibreOffice 4.3 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=75025 Bug 75025 depends on bug 82936, which changed state. Bug 82936 Summary: Editing : references to different sheet get removed on dragging cell https://bugs.freedesktop.org/show_bug.cgi?id=82936 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: framework/source sw/source
framework/source/uielement/langselectionmenucontroller.cxx |2 -
sw/source/uibase/shells/annotsh.cxx| 12 -
sw/source/uibase/shells/drwtxtex.cxx | 16 -
sw/source/uibase/shells/textsh1.cxx|5 +---
4 files changed, 29 insertions(+), 6 deletions(-)
New commits:
commit d15d7b7bbaa792d0102a603652a794e0a2212a47
Author: Maxim Monastirsky momonas...@gmail.com
Date: Fri Aug 22 14:24:43 2014 +0300
Open the right tab for the More... command
Partially fixed by Caolán in
3ac80237f310366afef0f7b6c427889d652bd369.
Remaining issues are the paragraph submenu, and the top
menu for both selection and paragraph. Also fixed for
the drawing text and annotations shells (including the
regression created by the above commit, that the dialog
didn't show at all).
Change-Id: I1ba4c825ad48af23ad5c07c8c5f25380952c0be1
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx
b/framework/source/uielement/langselectionmenucontroller.cxx
index 8d1ced1..6078453 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -207,7 +207,7 @@ void LanguageSelectionMenuController::fillPopupMenu(
Reference css::awt::XPopup
OUString aCmd_Language;
if( eMode == MODE_SetLanguageSelectionMenu )
{
-aCmd_Dialog += .uno:FontDialog?Language:string=*;
+aCmd_Dialog += .uno:FontDialog?Page:string=font;
aCmd_Language += .uno:LanguageStatus?Language:string=Current_;
}
else if ( eMode == MODE_SetLanguageParagraphMenu )
diff --git a/sw/source/uibase/shells/annotsh.cxx
b/sw/source/uibase/shells/annotsh.cxx
index e26f7d6..ad5b11c 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -466,8 +466,11 @@ void SwAnnotationShell::Exec( SfxRequest rReq )
case SID_CHAR_DLG:
{
const SfxItemSet* pArgs = rReq.GetArgs();
+const SfxPoolItem* pItem = 0;
+if (nSlot == SID_CHAR_DLG)
+pItem = pArgs-GetItem(FN_PARAM_1, false, TYPE(SfxStringItem)
);
-if( !pArgs )
+if( !pArgs || pItem )
{
/* mod
SwView* pView = GetView();
@@ -490,6 +493,13 @@ void SwAnnotationShell::Exec( SfxRequest rReq )
{
pDlg-SetCurPageId(fonteffects);
}
+else if (pItem)
+{
+const SfxStringItem* pStringItem = static_cast const
SfxStringItem* (pItem);
+if (pStringItem)
+
pDlg-SetCurPageId(OUStringToOString(pStringItem-GetValue(),
RTL_TEXTENCODING_UTF8));
+}
+
sal_uInt16 nRet = pDlg-Execute();
if(RET_OK == nRet )
{
diff --git a/sw/source/uibase/shells/drwtxtex.cxx
b/sw/source/uibase/shells/drwtxtex.cxx
index 559a50d..907dc5a 100644
--- a/sw/source/uibase/shells/drwtxtex.cxx
+++ b/sw/source/uibase/shells/drwtxtex.cxx
@@ -298,8 +298,11 @@ void SwDrawTextShell::Execute( SfxRequest rReq )
case SID_CHAR_DLG_FOR_PARAGRAPH:
{
const SfxItemSet* pArgs = rReq.GetArgs();
+const SfxPoolItem* pItem = 0;
+if (nSlot == SID_CHAR_DLG)
+pItem = pArgs-GetItem(FN_PARAM_1, false, TYPE(SfxStringItem)
);
-if( !pArgs )
+if( !pArgs || pItem )
{
aOldSelection = pOLV-GetSelection();
if (nSlot == SID_CHAR_DLG_FOR_PARAGRAPH)
@@ -329,6 +332,17 @@ void SwDrawTextShell::Execute( SfxRequest rReq )
{
pDlg-SetCurPageId(fonteffects);
}
+else if (nSlot == SID_CHAR_DLG_FOR_PARAGRAPH)
+{
+pDlg-SetCurPageId(font);
+}
+else if (pItem)
+{
+const SfxStringItem* pStringItem = static_cast const
SfxStringItem* (pItem);
+if (pStringItem)
+
pDlg-SetCurPageId(OUStringToOString(pStringItem-GetValue(),
RTL_TEXTENCODING_UTF8));
+}
+
sal_uInt16 nRet = pDlg-Execute();
if(RET_OK == nRet )
{
diff --git a/sw/source/uibase/shells/textsh1.cxx
b/sw/source/uibase/shells/textsh1.cxx
index 9ef3ae4..c899596 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -183,12 +183,11 @@ void sw_CharDialog( SwWrtShell rWrtSh, bool bUseDialog,
sal_uInt16 nSlot,const
{
pDlg-SetCurPageId(fonteffects);
}
-else if (pDlg nSlot == SID_ATTR_CHAR_FONT)
+else if (pDlg (nSlot == SID_ATTR_CHAR_FONT || nSlot ==
SID_CHAR_DLG_FOR_PARAGRAPH))
{
pDlg-SetCurPageId(font);
}
-
-if (pReq)
[Libreoffice-commits] core.git: sw/source
sw/source/core/layout/wsfrm.cxx |1 - 1 file changed, 1 deletion(-) New commits: commit 39a84ef78a8ead60694ad0c7dd170d4e54fbdaba Author: Stephan Bergmann sberg...@redhat.com Date: Fri Aug 22 13:46:53 2014 +0200 The comment apparently pertained to the following line ...cf. 75400111a50ce0b4026e7eb73a896ac3c28d6155 INTEGRATION: CWS swqbf64: #i65250# SwFrm::mnFrmId now in general available, but is rather useless nowadays anyway Change-Id: I1e9d6c289fad021764f7e1b1af0d7b9dca67bf53 diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index 47d6967..f62a056 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -71,7 +71,6 @@ using namespace ::com::sun::star; SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) : SwClient( pMod ), mbIfAccTableShouldDisposing( false ), //A member to identify if the acc table should dispose -// #i65250# mnFrmId( SwFrm::mnLastFrmId++ ), mpRoot( pSib ? pSib-getRootFrm() : 0 ), mpUpper( 0 ), ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - filter/source include/filter sw/source
filter/source/msfilter/msdffimp.cxx | 19 ---
include/filter/msfilter/msdffimp.hxx |5 -
sw/source/filter/ww8/ww8par.cxx |2 --
3 files changed, 26 deletions(-)
New commits:
commit e6fdd7ad0a4c548467157fa6791389e19f08993c
Author: Tor Lillqvist t...@collabora.com
Date: Fri Aug 22 14:42:58 2014 +0300
The bLastBoxInChain fields are unused
Change-Id: I741733a053c8b0123be8efbcb9fde39f53f6d83c
diff --git a/filter/source/msfilter/msdffimp.cxx
b/filter/source/msfilter/msdffimp.cxx
index 7d08824..bf13fe7 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5111,7 +5111,6 @@ SdrObject* SvxMSDffManager::ProcessObj(SvStream rSt,
{
SvxMSDffShapeInfo rInfo = **it;
pTextImpRec-bReplaceByFly = rInfo.bReplaceByFly;
-pTextImpRec-bLastBoxInChain = rInfo.bLastBoxInChain;
}
}
@@ -5661,7 +5660,6 @@ void SvxMSDffManager::CheckTxBxStoryChain()
boost::shared_ptrSvxMSDffShapeInfo const pObj = *iter;
if( pObj-nTxBxComp )
{
-pObj-bLastBoxInChain = false;
// group change?
// #156763#
// the text id also contains an internal drawing container id
@@ -5669,13 +5667,6 @@ void SvxMSDffManager::CheckTxBxStoryChain()
// drawing containers.
if( nChain != pObj-nTxBxComp )
{
-// previous was last of its group
-if (iter != m_pShapeInfosByTxBxComp-begin())
-{
-SvxMSDffShapeInfos_ByTxBxComp::iterator prev(iter);
---prev;
-(*prev)-bLastBoxInChain = true;
-}
// reset mark and helper flag
mark = iter;
nChain = pObj-nTxBxComp;
@@ -5702,11 +5693,6 @@ void SvxMSDffManager::CheckTxBxStoryChain()
pObj-nTxBxComp = pObj-nTxBxComp 0x;
m_pShapeInfosById-insert( pObj );
}
-// last one was last of its group
-if (!m_pShapeInfosByTxBxComp-empty())
-{
-(*m_pShapeInfosByTxBxComp-rbegin())-bLastBoxInChain = true;
-}
// free original array but don't free its elements
m_pShapeInfosByTxBxComp.reset();
}
@@ -7242,7 +7228,6 @@ SvxMSDffImportRec::SvxMSDffImportRec()
bHidden = false;
bReplaceByFly = false;
- bLastBoxInChain = true;
bVFlip = false;
bHFlip = false;
bAutoWidth = false;
@@ -7292,7 +7277,6 @@ SvxMSDffImportRec::SvxMSDffImportRec(const
SvxMSDffImportRec rCopy)
bHidden = rCopy.bHidden;
bReplaceByFly= rCopy.bReplaceByFly;
bAutoWidth = rCopy.bAutoWidth;
-bLastBoxInChain = rCopy.bLastBoxInChain;
bVFlip = rCopy.bVFlip;
bHFlip = rCopy.bHFlip;
nClientAnchorLen = rCopy.nClientAnchorLen;
diff --git a/include/filter/msfilter/msdffimp.hxx
b/include/filter/msfilter/msdffimp.hxx
index 6eb9a4f..5f2d1c9 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -259,7 +259,6 @@ struct MSFILTER_DLLPUBLIC SvxMSDffImportRec
boolbDrawHell :1;
boolbHidden :1;
boolbReplaceByFly :1;
-boolbLastBoxInChain :1;
boolbVFlip :1;
boolbHFlip :1;
boolbAutoWidth :1;
@@ -762,7 +761,6 @@ struct SvxMSDffShapeInfo
sal_uInt32 nTxBxComp;
bool bReplaceByFly :1; /// shape can be replaced by a frame in Writer
-bool bLastBoxInChain:1;
explicit SvxMSDffShapeInfo(sal_uLong nFPos, sal_uInt32 nId=0, // sal_uLong
nBIdx=0,
sal_uInt16 nSeqId=0, sal_uInt16 nBoxId=0):
@@ -771,7 +769,6 @@ struct SvxMSDffShapeInfo
nTxBxComp( (nSeqId 16) + nBoxId )
{
bReplaceByFly = false;
-bLastBoxInChain = true;
}
SvxMSDffShapeInfo(SvxMSDffShapeInfo rInfo):
nShapeId( rInfo.nShapeId ),
@@ -779,7 +776,6 @@ struct SvxMSDffShapeInfo
nTxBxComp( rInfo.nTxBxComp )
{
bReplaceByFly = rInfo.bReplaceByFly;
-bLastBoxInChain = rInfo.bLastBoxInChain;
}
};
diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 557d7e5..26b867d 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -830,7 +830,6 @@ SdrObject* SwMSDffManager::ProcessObj(SvStream rSt,
{
SvxMSDffShapeInfo rInfo = **it;
pImpRec-bReplaceByFly = rInfo.bReplaceByFly;
-pImpRec-bLastBoxInChain = rInfo.bLastBoxInChain;
}
}
commit db12d9042c71b872efe0ed2d94cf00852c57abb5
Author: Tor Lillqvist t...@collabora.com
Date: Fri Aug 22 14:25:56 2014 +0300
bHasUDefProp is
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Bug 79641 depends on bug 81756, which changed state. Bug 81756 Summary: Crasher in Format:Page... menu item https://bugs.freedesktop.org/show_bug.cgi?id=81756 What|Removed |Added Status|NEW |RESOLVED Resolution|--- |DUPLICATE -- 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: 3 commits - configure.ac postprocess/CustomTarget_images.mk postprocess/Package_images.mk vcl/qa vcl/source
configure.ac | 16
postprocess/CustomTarget_images.mk|3 +--
postprocess/Package_images.mk |3 +--
vcl/qa/cppunit/app/test_IconThemeInfo.cxx | 18 --
vcl/source/app/IconThemeInfo.cxx | 13 +
5 files changed, 15 insertions(+), 38 deletions(-)
New commits:
commit cf2c056bf0fbc6d52eaa670022016562d6f15bc3
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Aug 22 13:40:01 2014 +0200
remove special casing for default theme in vcl
Change-Id: I4d7a37ab9b31fcce7704f07d883d6f7806f066ec
diff --git a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
index 7231438..99083e5 100644
--- a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx
@@ -53,8 +53,6 @@ class IconThemeInfoTest : public CppUnit::TestFixture
CPPUNIT_TEST(ThemeIdIsDetectedFromFileNameWithUnderscore);
CPPUNIT_TEST(ImagesZipIsNotValid);
CPPUNIT_TEST(ImagesOxygenZipIsValid);
-CPPUNIT_TEST(DefaultZipIsValid);
-CPPUNIT_TEST(GalaxyIsReturnedAsDisplayNameForDefaultZip);
CPPUNIT_TEST(ExceptionIsThrownWhenIdCannotBeDetermined1);
CPPUNIT_TEST(ExceptionIsThrownWhenIdCannotBeDetermined2);
@@ -87,14 +85,6 @@ IconThemeInfoTest::ImagesOxygenZipIsValid()
}
void
-IconThemeInfoTest::DefaultZipIsValid()
-{
-OUString id(file://default.zip);
-bool valid = vcl::IconThemeInfo::UrlCanBeParsed(id);
-CPPUNIT_ASSERT_EQUAL_MESSAGE(default.zip is a valid theme name, true,
valid);
-}
-
-void
IconThemeInfoTest::ThemeIdIsDetectedFromFileNameWithUnderscore()
{
OUString fname(images_oxygen.zip);
@@ -130,14 +120,6 @@
IconThemeInfoTest::ExceptionIsThrownWhenIdCannotBeDetermined2()
CPPUNIT_ASSERT_EQUAL_MESSAGE(Exception was thrown, true, thrown);
}
-void
-IconThemeInfoTest::GalaxyIsReturnedAsDisplayNameForDefaultZip()
-{
-OUString id(file://default.zip);
-IconThemeInfo i(id);
-CPPUNIT_ASSERT_EQUAL_MESSAGE(default.zip is displayed as Galaxy,
OUString(Galaxy), i.GetDisplayName());
-}
-
// Put the test suite in the registry
CPPUNIT_TEST_SUITE_REGISTRATION(IconThemeInfoTest);
diff --git a/vcl/source/app/IconThemeInfo.cxx b/vcl/source/app/IconThemeInfo.cxx
index 5e18348..88d517c 100644
--- a/vcl/source/app/IconThemeInfo.cxx
+++ b/vcl/source/app/IconThemeInfo.cxx
@@ -60,7 +60,7 @@ IconThemeInfo::SizeByThemeName(const OUString themeName)
else if (themeName == crystal) {
return Size( 22, 22 );
}
-else if (themeName == default) {
+else if (themeName == galaxy) {
return Size( 22, 22 );
}
else {
@@ -76,10 +76,6 @@ IconThemeInfo::UrlCanBeParsed(const OUString url)
return false;
}
-if (fname == default.zip) {
-return true;
-}
-
if (!fname.startsWithIgnoreAsciiCase(ICON_THEME_PACKAGE_PREFIX)) {
return false;
}
@@ -94,9 +90,6 @@ IconThemeInfo::UrlCanBeParsed(const OUString url)
/*static*/ OUString
IconThemeInfo::FileNameToThemeId(const OUString filename)
{
-if (filename == default.zip) {
-return OUString(default);
-}
OUString r;
sal_Int32 positionOfLastDot =
filename.lastIndexOf(EXTENSION_FOR_ICON_PACKAGES);
if (positionOfLastDot 0) { // -1 means index not found
@@ -118,10 +111,6 @@ IconThemeInfo::ThemeIdToDisplayName(const OUString
themeId)
throw std::runtime_error(IconThemeInfo::ThemeIdToDisplayName() called
with invalid id.);
}
-if (themeId == default) {
-return OUString(Galaxy);
-}
-
// make the first letter uppercase
OUString r;
sal_Unicode firstLetter = themeId[0];
commit 0bcefcabdd86b11810b64d1166cfb2386717367b
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date: Fri Aug 22 13:36:16 2014 +0200
remove special casing for obsoleted default theme
Change-Id: I6688251eac8ecb5ea671cae281c2445df773be16
diff --git a/postprocess/CustomTarget_images.mk
b/postprocess/CustomTarget_images.mk
index e66a015..cbc9cef 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -18,8 +18,7 @@ helpimages_DIR := $(call
gb_CustomTarget_get_workdir,helpcontent2/source/auxilia
packimages_CUSTOM_FALLBACKS := -c $(SRCDIR)/icon-themes/tango -c
$(SRCDIR)/icon-themes/industrial
$(eval $(call gb_CustomTarget_register_targets,postprocess/images,\
- $(if $(filter default,$(WITH_THEMES)),images.zip) \
- $(foreach theme,$(filter-out
default,$(WITH_THEMES)),images_$(theme).zip) \
+ $(foreach theme,$(WITH_THEMES),images_$(theme).zip) \
commandimagelist.ilst \
sorted.lst \
))
diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk
index 66fb0cd..54cb84e 100644
--- a/postprocess/Package_images.mk
+++ b/postprocess/Package_images.mk
@@ -10,8 +10,7 @@
$(eval $(call gb_Package_Package,postprocess_images,$(call
[Bug 79641] LibreOffice 4.4 most annoying bugs
https://bugs.freedesktop.org/show_bug.cgi?id=79641 Eike Rathke er...@redhat.com changed: What|Removed |Added Depends on||81496 --- Comment #5 from Eike Rathke er...@redhat.com --- Adding bug 81496 Crash in Format Page -- 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: filter/source
filter/source/graphicfilter/itiff/itiff.cxx |5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 982029bd441a83da47873b5cea44e0009bd535c7
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 22 14:12:48 2014 +0200
Avoid incomplete type in fn sig to keep ubsan's RTTI-based checks happy
Change-Id: Id8796438fd63065a9aefdd4e142b6638a65bbb5f
diff --git a/filter/source/graphicfilter/itiff/itiff.cxx
b/filter/source/graphicfilter/itiff/itiff.cxx
index b588aa2..4606271 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -17,14 +17,15 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include sal/config.h
+
+#include vcl/FilterConfigItem.hxx
#include vcl/graph.hxx
#include vcl/bmpacc.hxx
#include vcl/animate.hxx
#include lzwdecom.hxx
#include ccidecom.hxx
-class FilterConfigItem;
-
namespace {
template typename T T BYTESWAP(T nByte) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sw/qa sw/source writerfilter/source
sw/qa/core/data/ooxml/pass/liststyle-gridbefore.docx |binary
sw/source/core/unocore/unoparagraph.cxx |2 +-
writerfilter/source/dmapper/StyleSheetTable.cxx |3 ++-
writerfilter/source/ooxml/modelpreprocess.py |4
4 files changed, 3 insertions(+), 6 deletions(-)
New commits:
commit 7c02c7b0216f642074b690cce889f1a02a2ef6b0
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Aug 22 13:51:54 2014 +0200
DOCX import: list styles don't support automatic updates
The problem was the following: setPropertyValue(IsAutoUpdate) on the
style failed - a number of styles was not imported in
StyleSheetTable::ApplyStyleSheets() due to the exception, then when we
tried to use one of the not imported styles, we also got an exception in
DomainMapper_Impl::finishParagraph(), which resulted in not calling
DomainMapperTableManager::handle(), so multiple cells of the same table
wanted the same range for cell contents, and that resulted in a crash.
Regression from cf33af732ed0d3d553bb74636e3b14c55d44c153 (handle
w:gridBefore by faking cells (fdo#38414), 2014-04-23), but that commit
just made the previously hidden problem visible.
Change-Id: I788cb6b4a2c7b7efbfa48297c658bb26450bf583
diff --git a/sw/qa/core/data/ooxml/pass/liststyle-gridbefore.docx
b/sw/qa/core/data/ooxml/pass/liststyle-gridbefore.docx
new file mode 100644
index 000..60dae2a
Binary files /dev/null and
b/sw/qa/core/data/ooxml/pass/liststyle-gridbefore.docx differ
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx
b/writerfilter/source/dmapper/StyleSheetTable.cxx
index 50e9b7e..1c39a8a 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -1203,7 +1203,8 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr
rFontTable )
xPropertySet-setPropertyValue(StyleInteropGrabBag,
uno::makeAny(aGrabBag));
}
-if (pEntry-bAutoRedefine)
+// List styles don't support automatic update.
+if (pEntry-bAutoRedefine !bListStyle)
xPropertySet-setPropertyValue(IsAutoUpdate,
uno::makeAny(sal_True));
}
else if(pEntry-nStyleTypeCode == STYLE_TYPE_TABLE)
commit 2a029e5f4ec7992422a02c575581a8b321c3f578
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Aug 22 10:55:06 2014 +0200
SwXParagraph::Impl::GetTxtNode: fix indenetation
Change-Id: Iac9e2883067b6cf4fdc259110642002b4ef6e48c
diff --git a/sw/source/core/unocore/unoparagraph.cxx
b/sw/source/core/unocore/unoparagraph.cxx
index c6c3e20..d83a19a 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -134,7 +134,7 @@ public:
{
}
- SwTxtNode * GetTxtNode() {
+SwTxtNode* GetTxtNode() {
return static_castSwTxtNode*(GetRegisteredInNonConst());
}
commit 8e9c34036220d9099386e83adb9a38ae008e1044
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Aug 22 10:11:12 2014 +0200
writerfilter: unused namespacealias attribute
Change-Id: I12f59c6d06323d3d9ebcd55ee5fe7e43597a11b4
diff --git a/writerfilter/source/ooxml/modelpreprocess.py
b/writerfilter/source/ooxml/modelpreprocess.py
index 246fae3..6b2e874 100644
--- a/writerfilter/source/ooxml/modelpreprocess.py
+++ b/writerfilter/source/ooxml/modelpreprocess.py
@@ -71,10 +71,6 @@ def check(model):
def preprocess(model):
for i in model.getElementsByTagName(namespace):
ns = i.getElementsByTagName(grammar)[0].getAttribute(ns)
-if ns in list(ooxUrlAliases.keys()):
-i.setAttribute(namespacealias, ooxUrlAliases[ns])
-else:
-i.setAttribute(namespacealias, )
if ns.startswith(http://schemas.openxmlformats.org/;):
i.setAttribute(prefix,
ns.replace('http://schemas.openxmlformats.org/', '').replace('/',
'_').replace('-', '_'))
else:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
--with-theme=default decprecated, use --with-theme=galaxy
Hi, tl;dr: dont use --with-theme=default, use --with-theme=galaxy instead just a note to packagers: --with-theme=default has been deprecated with: http://cgit.freedesktop.org/libreoffice/core/commit/?id=7524f45e0a2b86dc418f0eb76df89dbdbecfafd3 That option was nonsense anyway, as it packed galaxy (which is _not_ our default theme, tango is). That option also did needlessly weird things like packing that theme slightly different than the rest (e.g. default.zip or images.zip, while all sane themes use images_THEMENAME.zip). This self-contradicting weirdness has been removed too. Best, Bjoern ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: svx/source
svx/source/svdraw/sdrpagewindow.cxx |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 0073c78eaf3053140cb4481f1d1fa13df445b883 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Aug 22 14:21:05 2014 +0200 Rectangle coordinates are long, not sal_Int32 Change-Id: I2f4bd53bbf94ea439e774ea85e61adcdb920c497 diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 6e3cde9..0fd7532 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -387,8 +387,10 @@ void SdrPageWindow::InvalidatePageWindow(const basegfx::B2DRange rRange) } const Rectangle aVCLDiscreteRectangle( -(sal_Int32)floor(aDiscreteRange.getMinX()), (sal_Int32)floor(aDiscreteRange.getMinY()), -(sal_Int32)ceil(aDiscreteRange.getMaxX()), (sal_Int32)ceil(aDiscreteRange.getMaxY())); +static_castlong(floor(aDiscreteRange.getMinX())), +static_castlong(floor(aDiscreteRange.getMinY())), +static_castlong(ceil(aDiscreteRange.getMaxX())), +static_castlong(ceil(aDiscreteRange.getMaxY(; const bool bWasMapModeEnabled(rWindow.IsMapModeEnabled()); rWindow.EnableMapMode(false); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: vcl/qa
vcl/qa/cppunit/app/test_IconThemeInfo.cxx |6 -- 1 file changed, 6 deletions(-) New commits: commit d931eb2a93d6ae8a2549077c446d2b856ebe9e41 Author: Tor Lillqvist t...@collabora.com Date: Fri Aug 22 15:28:05 2014 +0300 WaE: Unreferenced function declarations Change-Id: I86087bac83de9756a1645fef6f0d74306f8d010d diff --git a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx index 99083e5..2a199d2 100644 --- a/vcl/qa/cppunit/app/test_IconThemeInfo.cxx +++ b/vcl/qa/cppunit/app/test_IconThemeInfo.cxx @@ -33,9 +33,6 @@ class IconThemeInfoTest : public CppUnit::TestFixture ImagesOxygenZipIsValid(); void -DefaultZipIsValid(); - -void ThemeIdIsDetectedFromFileNameWithUnderscore(); void @@ -44,9 +41,6 @@ class IconThemeInfoTest : public CppUnit::TestFixture void ExceptionIsThrownWhenIdCannotBeDetermined2(); -void -GalaxyIsReturnedAsDisplayNameForDefaultZip(); - // Adds code needed to register the test suite CPPUNIT_TEST_SUITE(IconThemeInfoTest); CPPUNIT_TEST(UpperCaseDisplayNameIsReturnedForNonDefaultId); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 15 ++--
bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx |1
bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx | 50
3 files changed, 58 insertions(+), 8 deletions(-)
New commits:
commit 970ad502e3ea2cc992c6cc1c7583231aec5bf5da
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 22 13:31:03 2014 +0100
Related: rhbz#1125588 ppc64le has new struct passing rules
http://gcc.gnu.org/ml/gcc-patches/2013-11/msg01145.html
http://gcc.gnu.org/ml/gcc-patches/2013-11/msg01147.html
now we just fail instead of crash
Change-Id: I329c676337885bcf4fdfdcdb5912d75424862126
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index c0ca97f..dbdef1b 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -72,7 +72,7 @@ static typelib_TypeClass cpp2uno_call(
if (pReturnTypeDescr)
{
-if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
+if (!ppc64::return_in_hidden_param(pReturnTypeRef))
{
pUnoReturn = pRegisterReturn; // direct way for simple types
}
@@ -599,7 +599,7 @@ const int codeSnippetSize = 24;
#endif
unsigned char * codeSnippet( unsigned char * code, sal_Int32 nFunctionIndex,
sal_Int32 nVtableOffset,
- bool simpleRetType)
+ bool bHasHiddenParam)
{
#if OSL_DEBUG_LEVEL 2
fprintf(stderr,in codeSnippet functionIndex is %x\n, nFunctionIndex);
@@ -608,9 +608,8 @@ unsigned char * codeSnippet( unsigned char * code,
sal_Int32 nFunctionIndex, sa
sal_uInt64 nOffsetAndIndex = ( ( (sal_uInt64) nVtableOffset ) 32 ) | (
(sal_uInt64) nFunctionIndex );
-if ( !simpleRetType )
+if ( bHasHiddenParam )
nOffsetAndIndex |= 0x8000;
-
#if _CALL_ELF == 2
unsigned int *raw = (unsigned int *)code[0];
@@ -629,7 +628,7 @@ unsigned char * codeSnippet( unsigned char * code,
sal_Int32 nFunctionIndex, sa
#endif
#if OSL_DEBUG_LEVEL 2
fprintf(stderr, in: offset/index is %x %x %d, %lx\n,
-nFunctionIndex, nVtableOffset, !simpleRetType, raw[2]);
+nFunctionIndex, nVtableOffset, bHasHiddenParam, raw[2]);
#endif
return (code + codeSnippetSize);
}
@@ -696,7 +695,7 @@ unsigned char *
bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
(s++)-fn = code + writetoexecdiff;
code = codeSnippet(
code, functionOffset++, vtableOffset,
-bridges::cpp_uno::shared::isSimpleType(
+ppc64::return_in_hidden_param(
reinterpret_cast
typelib_InterfaceAttributeTypeDescription * (
member)-pAttributeTypeRef));
@@ -707,7 +706,7 @@ unsigned char *
bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
member)-bReadOnly)
{
(s++)-fn = code + writetoexecdiff;
-code = codeSnippet(code, functionOffset++, vtableOffset, true);
+code = codeSnippet(code, functionOffset++, vtableOffset,
false);
}
break;
@@ -715,7 +714,7 @@ unsigned char *
bridges::cpp_uno::shared::VtableFactory::addLocalFunctions(
(s++)-fn = code + writetoexecdiff;
code = codeSnippet(
code, functionOffset++, vtableOffset,
-bridges::cpp_uno::shared::isSimpleType(
+ppc64::return_in_hidden_param(
reinterpret_cast
typelib_InterfaceMethodTypeDescription * (
member)-pReturnTypeRef));
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
index 87303b6..b5f609a 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/share.hxx
@@ -85,6 +85,7 @@ void fillUnoException(
namespace ppc64
{
enum ppclimits { MAX_GPR_REGS = 8, MAX_SSE_REGS = 13 };
+bool return_in_hidden_param( typelib_TypeDescriptionReference *pTypeRef );
}
#endif
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
index 33131ea..55a5308 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
@@ -37,6 +37,56 @@
using namespace ::rtl;
using namespace ::com::sun::star::uno;
+namespace ppc64
+{
+#if _CALL_ELF == 2
+bool is_complex_struct(const typelib_TypeDescription * type)
+{
+const typelib_CompoundTypeDescription * p
+= reinterpret_cast const typelib_CompoundTypeDescription *
(type);
+for (sal_Int32 i = 0; i p-nMembers; ++i)
+{
+
[Libreoffice-commits] core.git: include/svx svx/source
include/svx/sxmspitm.hxx | 22 ++
svx/source/svdraw/svdattr.cxx |4 ++--
svx/source/svdraw/svdobj.cxx |8
3 files changed, 12 insertions(+), 22 deletions(-)
New commits:
commit 9a6d1c6e16132253327e27b5f7a8cff6b8fa4bc9
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 22 14:45:43 2014 +0200
Consistency around SdrYesNoItem in svx/sxmspitm.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 Remove unused ctors and
68969cc61adecac481ae9656978ef952f435b310 Consistency around SdrMetricItem.
Change-Id: If7a3c3834f63bd0b358da4d05e9510c3f695c5d0
diff --git a/include/svx/sxmspitm.hxx b/include/svx/sxmspitm.hxx
index 6cfd5b2..9859ebf 100644
--- a/include/svx/sxmspitm.hxx
+++ b/include/svx/sxmspitm.hxx
@@ -22,23 +22,13 @@
#include svx/svddef.hxx
#include svx/sdynitm.hxx
+inline SdrYesNoItem makeSdrObjMoveProtectItem(bool bOn) {
+return SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, bOn);
+}
-// class SdrMoveProtectItem
-
-class SdrObjMoveProtectItem: public SdrYesNoItem {
-public:
-SdrObjMoveProtectItem(bool bOn=false):
SdrYesNoItem(SDRATTR_OBJMOVEPROTECT,bOn) {}
-SdrObjMoveProtectItem(SvStream rIn):
SdrYesNoItem(SDRATTR_OBJMOVEPROTECT,rIn) {}
-};
-
-
-// class SdrSizeProtectItem
-
-class SdrObjSizeProtectItem: public SdrYesNoItem {
-public:
-SdrObjSizeProtectItem(bool bOn=false):
SdrYesNoItem(SDRATTR_OBJSIZEPROTECT,bOn) {}
-SdrObjSizeProtectItem(SvStream rIn):
SdrYesNoItem(SDRATTR_OBJSIZEPROTECT,rIn) {}
-};
+inline SdrYesNoItem makeSdrObjSizeProtectItem(bool bOn) {
+return SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, bOn);
+}
#endif
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 7d2e479..08da659 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -201,8 +201,8 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[SDRATTR_CIRCKIND -SDRATTR_START]=new
SdrCircKindItem;
mppLocalPoolDefaults[SDRATTR_CIRCSTARTANGLE-SDRATTR_START]=new
SdrCircStartAngleItem;
mppLocalPoolDefaults[SDRATTR_CIRCENDANGLE -SDRATTR_START]=new
SdrCircEndAngleItem;
-mppLocalPoolDefaults[SDRATTR_OBJMOVEPROTECT -SDRATTR_START]=new
SdrObjMoveProtectItem;
-mppLocalPoolDefaults[SDRATTR_OBJSIZEPROTECT -SDRATTR_START]=new
SdrObjSizeProtectItem;
+mppLocalPoolDefaults[SDRATTR_OBJMOVEPROTECT -SDRATTR_START]=new
SdrYesNoItem(SDRATTR_OBJMOVEPROTECT, false);
+mppLocalPoolDefaults[SDRATTR_OBJSIZEPROTECT -SDRATTR_START]=new
SdrYesNoItem(SDRATTR_OBJSIZEPROTECT, false);
mppLocalPoolDefaults[SDRATTR_OBJPRINTABLE -SDRATTR_START]=new
SdrObjPrintableItem;
mppLocalPoolDefaults[SDRATTR_OBJVISIBLE -SDRATTR_START]=new
SdrObjVisibleItem;
mppLocalPoolDefaults[SDRATTR_LAYERID-SDRATTR_START]=new
SdrLayerIdItem;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 8b0ee84..c7a8b96 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2203,11 +2203,11 @@ void SdrObject::NbcApplyNotPersistAttr(const
SfxItemSet rAttr)
}
if
(rAttr.GetItemState(SDRATTR_OBJMOVEPROTECT,true,pPoolItem)==SFX_ITEM_SET) {
-bool b=((const SdrObjMoveProtectItem*)pPoolItem)-GetValue();
+bool b=((const SdrYesNoItem*)pPoolItem)-GetValue();
SetMoveProtect(b);
}
if
(rAttr.GetItemState(SDRATTR_OBJSIZEPROTECT,true,pPoolItem)==SFX_ITEM_SET) {
-bool b=((const SdrObjSizeProtectItem*)pPoolItem)-GetValue();
+bool b=((const SdrYesNoItem*)pPoolItem)-GetValue();
SetResizeProtect(b);
}
@@ -2283,8 +2283,8 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet rAttr,
bool bMerge) const
{
const Rectangle rSnap=GetSnapRect();
const Rectangle rLogic=GetLogicRect();
-lcl_SetItem(rAttr,bMerge,SdrObjMoveProtectItem(IsMoveProtect()));
-lcl_SetItem(rAttr,bMerge,SdrObjSizeProtectItem(IsResizeProtect()));
+lcl_SetItem(rAttr,bMerge,makeSdrObjMoveProtectItem(IsMoveProtect()));
+lcl_SetItem(rAttr,bMerge,makeSdrObjSizeProtectItem(IsResizeProtect()));
lcl_SetItem(rAttr,bMerge,SdrObjPrintableItem(IsPrintable()));
lcl_SetItem(rAttr,bMerge,SdrObjVisibleItem(IsVisible()));
lcl_SetItem(rAttr,bMerge,SdrRotateAngleItem(GetRotateAngle()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
New commits:
commit ee6fcdd18b1a839d7d60617d4fda622f6e6e7e66
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 22 13:52:53 2014 +0100
Related: rhbz#1125588 ppc64le fix simple struct returning
Change-Id: I1e253922fdb606648eff9865f1125a24e35b0d9a
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
index 55a5308..aa054d7 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
@@ -305,14 +305,18 @@ static void cpp_call(
void * pCppReturn = 0; // if != 0 != pUnoReturn, needs reconversion
-bool bOverflow = false;
+bool bOverflow = false;
+bool bSimpleReturn = true;
if (pReturnTypeDescr)
{
#if OSL_DEBUG_LEVEL 2
fprintf(stderr, return type is %d\n, pReturnTypeDescr-eTypeClass);
#endif
-if (bridges::cpp_uno::shared::isSimpleType( pReturnTypeDescr ))
+if (ppc64::return_in_hidden_param(pReturnTypeRef))
+bSimpleReturn = false;
+
+if (bSimpleReturn)
{
pCppReturn = pUnoReturn; // direct way for simple types
#if OSL_DEBUG_LEVEL 2
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sw/qa writerfilter/source
sw/qa/extras/ooxmlimport/data/bnc519228_odd-breaks.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx| 31 ++
writerfilter/source/dmapper/PropertyMap.cxx | 180 +---
writerfilter/source/dmapper/PropertyMap.hxx |2
4 files changed, 138 insertions(+), 75 deletions(-)
New commits:
commit 3680f2d74964c38f153fd26a09d773a0592a1aa6
Author: LuboÅ¡ LuÅák l.lu...@collabora.com
Date: Sun Aug 17 21:35:48 2014 +0200
fix reading even/odd page breaks from .docx (bnc#519228)
We map Word's even/odd page breaks to Writer's left/right page styles. And
we cannot
just set any page style to be left/right, because that could set e.g. the
default
page style as such, which would make all normal pages that way. So instead
we need
to make a copy of the relevant page style, as the original page style as
its follow,
copy all the properties and headers/footers, and use this copy to get the
page break.
(cherry picked from commit b32881b6723072c8d1a652ea147d12e75766d504)
Conflicts:
sw/qa/extras/ooxmlimport/ooxmlimport.cxx
Change-Id: Id0d2568de91ac2de4afb0ba3a6eedd9cec46f878
Reviewed-on: https://gerrit.libreoffice.org/11025
Reviewed-by: Miklos Vajna vmik...@collabora.co.uk
Tested-by: Miklos Vajna vmik...@collabora.co.uk
diff --git a/sw/qa/extras/ooxmlimport/data/bnc519228_odd-breaks.docx
b/sw/qa/extras/ooxmlimport/data/bnc519228_odd-breaks.docx
new file mode 100644
index 000..8711d62
Binary files /dev/null and
b/sw/qa/extras/ooxmlimport/data/bnc519228_odd-breaks.docx differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index fb82c8f..9dab8ea 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -52,6 +52,7 @@
#include com/sun/star/xml/dom/XDocument.hpp
#include com/sun/star/text/XDocumentIndex.hpp
#include com/sun/star/style/CaseMap.hpp
+#include com/sun/star/style/PageStyleLayout.hpp
#include com/sun/star/style/ParagraphAdjust.hpp
#include vcl/svapp.hxx
#include unotools/fltrcfg.hxx
@@ -2233,6 +2234,36 @@ DECLARE_OOXMLIMPORT_TEST(testHidemark, hidemark.docx)
CPPUNIT_ASSERT_EQUAL(text::SizeType::FIX,
getPropertysal_Int16(xTableRows-getByIndex(1), SizeType));
}
+DECLARE_OOXMLIMPORT_TEST(testBnc519228OddBreaks, bnc519228_odd-breaks.docx)
+{
+// Check that all the normal styles are not set as right-only, those
should be only those used after odd page breaks.
+uno::Referencebeans::XPropertySet
defaultStyle(getStyles(PageStyles)-getByName(DEFAULT_STYLE), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(uno::makeAny(style::PageStyleLayout_ALL),
defaultStyle-getPropertyValue(PageStyleLayout));
+uno::Referencebeans::XPropertySet firstPage(
getStyles(PageStyles)-getByName(First Page), uno::UNO_QUERY );
+CPPUNIT_ASSERT_EQUAL(uno::makeAny(style::PageStyleLayout_ALL),
firstPage-getPropertyValue(PageStyleLayout));
+
+OUString page1StyleName = getPropertyOUString( getParagraph( 1, This is
the first page. ), PageDescName);
+uno::Referencebeans::XPropertySet
page1Style(getStyles(PageStyles)-getByName(page1StyleName), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(uno::makeAny(style::PageStyleLayout_RIGHT),
page1Style-getPropertyValue(PageStyleLayout));
+getParagraphOfText( 1, getProperty uno::Referencetext::XText
(page1Style, HeaderText), This is the header for odd pages);
+
+// Page2 comes from follow of style for page 1 and should be a normal
page. Also check the two page style have the same properties,
+// since page style for page1 was created from page style for page 2.
+OUString page2StyleName = getPropertyOUString( getParagraph( 3, This is
page 2, which is obviously an even page. ), PageDescName);
+CPPUNIT_ASSERT_EQUAL(OUString(), page2StyleName);
+page2StyleName = getPropertyOUString( page1Style, FollowStyle );
+uno::Referencebeans::XPropertySet
page2Style(getStyles(PageStyles)-getByName(page2StyleName), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(uno::makeAny(style::PageStyleLayout_ALL),
page2Style-getPropertyValue(PageStyleLayout));
+getParagraphOfText( 1, getProperty uno::Referencetext::XText
(page2Style, HeaderTextLeft), This is the even header);
+getParagraphOfText( 1, getProperty uno::Referencetext::XText
(page2Style, HeaderTextRight), This is the header for odd pages);
+CPPUNIT_ASSERT_EQUAL(getPropertysal_Int32(page1Style, TopMargin),
getPropertysal_Int32(page2Style, TopMargin));
+
+OUString page5StyleName = getPropertyOUString( getParagraph( 5, Then an
odd break after an odd page, should lead us to page #5. ), PageDescName);
+uno::Referencebeans::XPropertySet
page5Style(getStyles(PageStyles)-getByName(page5StyleName), uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(uno::makeAny(style::PageStyleLayout_RIGHT),
page5Style-getPropertyValue(PageStyleLayout));
+getParagraphOfText( 1, getProperty
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/map.cxx | 45 ++---
1 file changed, 22 insertions(+), 23 deletions(-)
New commits:
commit 5660bc11b0e80114ccf1ea9daa19c70e35b2d0e3
Author: Noel Grandin n...@peralex.com
Date: Thu Aug 21 11:41:57 2014 +0200
vcl: convert a couple of macros to static functions
Change-Id: I037dd97049aecff023f0ffb8dfdbb772dbde7ae0
Reviewed-on: https://gerrit.libreoffice.org/11069
Reviewed-by: Noel Grandin noelgran...@gmail.com
Tested-by: Noel Grandin noelgran...@gmail.com
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index deaddcb..ee25091 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -1583,16 +1583,13 @@ Region OutputDevice::PixelToLogic( const Region
rDeviceRegion, const MapMode r
return aRegion;
}
-#define ENTER0( rSource, pMapModeSource, pMapModeDest ) \
+#define ENTER1( rSource, pMapModeSource, pMapModeDest ) \
if ( !pMapModeSource ) \
pMapModeSource = maMapMode;\
if ( !pMapModeDest )\
pMapModeDest = maMapMode; \
if ( *pMapModeSource == *pMapModeDest ) \
-return rSource
-
-#define ENTER1( rSource, pMapModeSource, pMapModeDest ) \
-ENTER0( rSource, pMapModeSource, pMapModeDest );\
+return rSource; \
\
ImplMapRes aMapResSource; \
aMapResSource.mnMapOfsX = 0; \
@@ -1626,19 +1623,21 @@ Region OutputDevice::PixelToLogic( const Region
rDeviceRegion, const MapMode r
else\
aMapResDest = maMapRes
-#define ENTER2( eUnitSource, eUnitDest )\
-DBG_ASSERT( eUnitSource != MAP_SYSFONT \
- eUnitSource != MAP_APPFONT \
- eUnitSource != MAP_RELATIVE, \
-Source MapUnit nicht erlaubt ); \
-DBG_ASSERT( eUnitDest != MAP_SYSFONT\
- eUnitDest != MAP_APPFONT \
- eUnitDest != MAP_RELATIVE, \
-Destination MapUnit nicht erlaubt ); \
-DBG_ASSERTWARNING( eUnitSource != MAP_PIXEL,\
- MAP_PIXEL mit 72dpi angenaehert ); \
-DBG_ASSERTWARNING( eUnitDest != MAP_PIXEL, \
- MAP_PIXEL mit 72dpi angenaehert )
+static void verifyUnitSourceDest( MapUnit eUnitSource, MapUnit eUnitDest )
+{
+DBG_ASSERT( eUnitSource != MAP_SYSFONT
+ eUnitSource != MAP_APPFONT
+ eUnitSource != MAP_RELATIVE,
+Source MapUnit nicht erlaubt );
+DBG_ASSERT( eUnitDest != MAP_SYSFONT
+ eUnitDest != MAP_APPFONT
+ eUnitDest != MAP_RELATIVE,
+Destination MapUnit nicht erlaubt );
+DBG_ASSERTWARNING( eUnitSource != MAP_PIXEL,
+ MAP_PIXEL mit 72dpi angenaehert );
+DBG_ASSERTWARNING( eUnitDest != MAP_PIXEL,
+ MAP_PIXEL mit 72dpi angenaehert );
+}
#define ENTER3( eUnitSource, eUnitDest )\
long nNumerator = 1; \
@@ -1890,7 +1889,7 @@ Point OutputDevice::LogicToLogic( const Point rPtSource,
MapUnit eUnitSource = rMapModeSource.GetMapUnit();
MapUnit eUnitDest = rMapModeDest.GetMapUnit();
-ENTER2( eUnitSource, eUnitDest );
+verifyUnitSourceDest( eUnitSource, eUnitDest );
if ( rMapModeSource.mpImplMapMode-mbSimple
rMapModeDest.mpImplMapMode-mbSimple )
@@ -1924,7 +1923,7 @@ Size OutputDevice::LogicToLogic( const Size rSzSource,
MapUnit eUnitSource = rMapModeSource.GetMapUnit();
MapUnit eUnitDest = rMapModeDest.GetMapUnit();
-ENTER2( eUnitSource, eUnitDest );
+verifyUnitSourceDest( eUnitSource, eUnitDest );
if ( rMapModeSource.mpImplMapMode-mbSimple
rMapModeDest.mpImplMapMode-mbSimple )
@@ -1990,7 +1989,7 @@ basegfx::B2DHomMatrix OutputDevice::LogicToLogic(const
MapMode rMapModeSource,
MapUnit eUnitSource = rMapModeSource.GetMapUnit();
MapUnit eUnitDest = rMapModeDest.GetMapUnit();
-ENTER2(eUnitSource, eUnitDest);
+verifyUnitSourceDest(eUnitSource, eUnitDest);
if(rMapModeSource.mpImplMapMode-mbSimple
rMapModeDest.mpImplMapMode-mbSimple)
{
@@ -2027,7 +2026,7 @@ Rectangle OutputDevice::LogicToLogic(
[Libreoffice-commits] core.git: 2 commits - sw/inc sw/source
sw/inc/dialog.hrc|2 +-
sw/inc/index.hrc |2 +-
sw/source/ui/dialog/dialog.src |6 ++
sw/source/ui/index/idxmrk.src|6 ++
sw/source/ui/index/swuiidxmrk.cxx|3 +--
sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx |7 ---
6 files changed, 11 insertions(+), 15 deletions(-)
New commits:
commit 82ddade71441ba98427470b8a05a56b7b572e74e
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 22 14:18:42 2014 +0100
QueryBox RID_QB_SPELL_CONTINUE - MessageDialog + string
Change-Id: Ie08970cefccdb1339e162bb5f4d3318efc6c61a5
diff --git a/sw/inc/dialog.hrc b/sw/inc/dialog.hrc
index e4a171f..769101d 100644
--- a/sw/inc/dialog.hrc
+++ b/sw/inc/dialog.hrc
@@ -24,7 +24,7 @@
// Dialoge **
-#define RID_QB_SPELL_CONTINUE (RC_DIALOG_BEGIN + 11)
+#define STR_QUERY_SPELL_CONTINUE (RC_DIALOG_BEGIN + 11)
#define STR_SPELLING_COMPLETED (RC_DIALOG_BEGIN + 12)
// Strings **
diff --git a/sw/source/ui/dialog/dialog.src b/sw/source/ui/dialog/dialog.src
index 19f96a0..80e0d4f 100644
--- a/sw/source/ui/dialog/dialog.src
+++ b/sw/source/ui/dialog/dialog.src
@@ -35,11 +35,9 @@ String STR_PATH_NOT_FOUND
Text [ en-US ] = The directory '%1' does not exist. ;
};
-QueryBox RID_QB_SPELL_CONTINUE
+String STR_QUERY_SPELL_CONTINUE
{
-BUTTONS = WB_YES_NO ;
-DEFBUTTON = WB_DEF_YES ;
-MESSAGE [ en-US ] = Continue checking at beginning of document? ;
+Text [ en-US ] = Continue checking at beginning of document? ;
};
String STR_SPELLING_COMPLETED
{
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index 90a5632..ddf8ac5 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -18,7 +18,7 @@
*/
#include SwSpellDialogChildWindow.hxx
-#include vcl/msgbox.hxx
+#include vcl/layout.hxx
#include editeng/svxacorr.hxx
#include editeng/acorrcfg.hxx
#include svx/svxids.hrc
@@ -391,7 +391,8 @@ The code below would only be part of the solution.
if(m_pSpellState-m_xStartRange.is())
{
LockFocusNotification( true );
-sal_uInt16 nRet = QueryBox( GetWindow(),
SW_RES(RID_QB_SPELL_CONTINUE)).Execute();
+sal_uInt16 nRet = MessageDialog(GetWindow(),
SW_RES(STR_QUERY_SPELL_CONTINUE),
+VCL_MESSAGE_QUESTION,
VCL_BUTTONS_YES_NO).Execute();
if(RET_YES == nRet)
{
SwUnoInternalPaM aPam(*pWrtShell-GetDoc());
@@ -420,7 +421,7 @@ The code below would only be part of the solution.
OUString sInfo(SW_RES(STR_SPELLING_COMPLETED));
// #i84610#
Window* pTemp = GetWindow();// temporary needed for g++
3.3.5
-InfoBox(pTemp, sInfo ).Execute();
+MessageDialog(pTemp, sInfo, VCL_MESSAGE_INFO).Execute();
LockFocusNotification( false );
// take care that the now valid selection is stored
LoseFocus();
commit 302cb1d031af68aa13820eae2265f46199433ab9
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 22 12:46:55 2014 +0100
QueryBox DLG_CHANGE_AUTH_ENTRY - MessageDialog + string
Change-Id: I836381f710e4f36b977284f6996bb135fc328049
diff --git a/sw/inc/index.hrc b/sw/inc/index.hrc
index 192e3c1..aa4b984 100644
--- a/sw/inc/index.hrc
+++ b/sw/inc/index.hrc
@@ -39,7 +39,7 @@
#define STR_AUTOMARK_TYPE (RC_INDEX_BEGIN + 17)
#define STR_FILE_NOT_FOUND (RC_INDEX_BEGIN + 18)
-#define DLG_CHANGE_AUTH_ENTRY (RC_INDEX_BEGIN + 19)
+#define STR_QUERY_CHANGE_AUTH_ENTRY (RC_INDEX_BEGIN + 19)
#define STR_USER_DEFINED_INDEX (RC_INDEX_BEGIN + 20)
#define STR_NOSORTKEY (RC_INDEX_BEGIN + 21)
#define STR_NO_CHAR_STYLE (RC_INDEX_BEGIN + 22)
diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src
index 072fa46..0519dbe 100644
--- a/sw/source/ui/index/idxmrk.src
+++ b/sw/source/ui/index/idxmrk.src
@@ -32,11 +32,9 @@ String STR_IDXMRK_INSERT
Text [ en-US ] = Insert Index Entry ;
};
-QueryBox DLG_CHANGE_AUTH_ENTRY
+String STR_QUERY_CHANGE_AUTH_ENTRY
{
-BUTTONS = WB_YES_NO ;
-DEFBUTTON = WB_DEF_NO ;
-Message [ en-US ] = The document already contains the bibliography entry
but with different data. Do you want to adjust the existing entries?;
+Text [ en-US ] = The document already contains the bibliography entry but
with different data. Do you want to adjust the existing entries?;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/index/swuiidxmrk.cxx
[Libreoffice-commits] core.git: wizards/source
wizards/source/access2base/Application.xba |2 wizards/source/access2base/Control.xba |1 wizards/source/access2base/Form.xba| 10 ++- wizards/source/access2base/Methods.xba | 93 ++--- wizards/source/access2base/SubForm.xba |9 ++ wizards/source/access2base/acConstants.xba |2 6 files changed, 60 insertions(+), 57 deletions(-) New commits: commit 1cbd9f7fbe327662d44605e4b3d4150b740b6f33 Author: Jean-Pierre Ledure j...@ledure.be Date: Sun Aug 17 16:25:58 2014 +0200 Access2Base - Remove _This in Form and SubForm objects The construction in Basic Set a._This = a is useful to export the address of an object to Subs or Functions. It increases however the risk of memory leaks. Avoid when avoidable. Change-Id: I81bf01badf00687526a358eda117a55b12f5d72b diff --git a/wizards/source/access2base/Application.xba b/wizards/source/access2base/Application.xba index 8b2af9a..f68ced5 100644 --- a/wizards/source/access2base/Application.xba +++ b/wizards/source/access2base/Application.xba @@ -329,7 +329,6 @@ Dim iCurrentDoc As Integer, vCurrentDoc As Variant, oForms As Variant, oCounter apos; Process when ARGUMENT = STRING or INDEX =gt; Initialize form object Dim ofForm As Object Set ofForm = New Form - Set ofForm._This = ofForm Dim sAllForms As Variant, i As Integer, vName As Variant, oDatabase As Object, bFound As Boolean Select Case vCurrentDoc.DbConnect Case DBCONNECTBASE @@ -1096,7 +1095,6 @@ Dim i As Integer, iCount As Integer, iAllCount As Integer, ofForm As Variant iCount = 0 If iAllCount gt; 0 Then Set ofForm = New Form - Set ofForm._This = ofForm For i = 0 To iAllCount - 1 Set ofForm = Application.AllForms(i) If ofForm.IsLoaded Then iCount = iCount + 1 diff --git a/wizards/source/access2base/Control.xba b/wizards/source/access2base/Control.xba index b6d0410..1d54b01 100644 --- a/wizards/source/access2base/Control.xba +++ b/wizards/source/access2base/Control.xba @@ -1223,7 +1223,6 @@ Dim vSelection As Variant, sSelectedText As String Case UCase(quot;Formquot;) Set ofSubForm = New SubForm apos; Start building the SUBFORM object With ofSubForm - Set ._This = ofSubForm Set .DatabaseForm = ControlModel ._Name = _Name ._Shortcut = _Shortcut amp; quot;.Formquot; diff --git a/wizards/source/access2base/Form.xba b/wizards/source/access2base/Form.xba index 4ec1949..1a29295 100644 --- a/wizards/source/access2base/Form.xba +++ b/wizards/source/access2base/Form.xba @@ -15,7 +15,6 @@ REM --- CLASS ROOT FIELDS --- REM --- Private_Type As String apos; Must be FORM -Private _This As Object Private_Shortcut As String Private_Name As String Private _DocEntry As Integer apos; Doc- and DbContainer entries in Root structure @@ -32,7 +31,6 @@ REM --- CONSTRUCTORS / DESTRUCTORS --- REM --- Private Sub Class_Initialize() _Type = OBJFORM - Set _This = Nothing _Shortcut = quot;quot; _Name = quot;quot; _DocEntry = -1 @@ -225,11 +223,17 @@ Public Function OptionGroup(ByVal Optional pvGroupName As Variant) As Variant apos; Return either an error or an object of type OPTIONGROUP based on its name Const cstThisSub = quot;Form.OptionGroupquot; +Dim ogGroup As Object Utils._SetCalledSub(cstThisSub) If IsMissing(pvGroupName) Then Call _TraceArguments() If _ErrorHandler() Then On Local Error Goto Error_Function - Set OptionGroup = _OptionGroup(pvGroupName, CTLPARENTISFORM, _This) + Set ogGroup = _OptionGroup(pvGroupName, CTLPARENTISFORM, Component, DatabaseForm) + If Not IsNull(ogGroup) Then + ogGroup._DocEntry = _DocEntry + ogGroup._DbEntry = _DbEntry + End If + Set OptionGroup = ogGroup Exit_Function:
[Libreoffice-commits] core.git: include/svl svx/inc svx/source
include/svl/stritem.hxx |2 +-
svx/inc/sxonitm.hxx |9 +++--
svx/source/svdraw/svdattr.cxx |2 +-
svx/source/svdraw/svdobj.cxx |4 ++--
4 files changed, 7 insertions(+), 10 deletions(-)
New commits:
commit e426e448ce2bd889f287ce13295092a75fa6150d
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 22 15:40:30 2014 +0200
Consistency around SfxStringItem in svx/inc/sxonitm.hxx
...similar to what has been done for svx/sdtmfitm.hxx in
6a2ea81ca1622d2c2ad55bea8ddc28167fcc2794 Remove unused ctors and
68969cc61adecac481ae9656978ef952f435b310 Consistency around SdrMetricItem.
Change-Id: I694c42a53cb9041b51ef876416f0f61963b89f86
diff --git a/include/svl/stritem.hxx b/include/svl/stritem.hxx
index 8e3f061..8d6da4f 100644
--- a/include/svl/stritem.hxx
+++ b/include/svl/stritem.hxx
@@ -29,7 +29,7 @@ class SVL_DLLPUBLIC SfxStringItem: public
CntUnencodedStringItem
public:
TYPEINFO_OVERRIDE();
-SfxStringItem() {}
+SfxStringItem(sal_uInt16 which = 0): CntUnencodedStringItem(which) {}
SfxStringItem(sal_uInt16 which, const OUString rValue):
CntUnencodedStringItem(which, rValue) {}
diff --git a/svx/inc/sxonitm.hxx b/svx/inc/sxonitm.hxx
index 6c3916ed..820e398 100644
--- a/svx/inc/sxonitm.hxx
+++ b/svx/inc/sxonitm.hxx
@@ -22,12 +22,9 @@
#include svx/svddef.hxx
#include svl/stritem.hxx
-class SdrObjectNameItem: public SfxStringItem {
-public:
-SdrObjectNameItem() : SfxStringItem() {
SetWhich(SDRATTR_OBJECTNAME); }
-SdrObjectNameItem(const OUString rStr) :
SfxStringItem(SDRATTR_OBJECTNAME,rStr) {}
-SdrObjectNameItem(SvStream rIn) :
SfxStringItem(SDRATTR_OBJECTNAME,rIn) {}
-};
+inline SfxStringItem makeSdrObjectNameItem(const OUString rStr) {
+return SfxStringItem(SDRATTR_OBJECTNAME,rStr);
+}
#endif
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 08da659..cb790e5 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -207,7 +207,7 @@ SdrItemPool::SdrItemPool(
mppLocalPoolDefaults[SDRATTR_OBJVISIBLE -SDRATTR_START]=new
SdrObjVisibleItem;
mppLocalPoolDefaults[SDRATTR_LAYERID-SDRATTR_START]=new
SdrLayerIdItem;
mppLocalPoolDefaults[SDRATTR_LAYERNAME -SDRATTR_START]=new
SdrLayerNameItem;
-mppLocalPoolDefaults[SDRATTR_OBJECTNAME -SDRATTR_START]=new
SdrObjectNameItem;
+mppLocalPoolDefaults[SDRATTR_OBJECTNAME -SDRATTR_START]=new
SfxStringItem(SDRATTR_OBJECTNAME);
mppLocalPoolDefaults[SDRATTR_ALLPOSITIONX -SDRATTR_START]=new
SdrAllPositionXItem;
mppLocalPoolDefaults[SDRATTR_ALLPOSITIONY -SDRATTR_START]=new
SdrAllPositionYItem;
mppLocalPoolDefaults[SDRATTR_ALLSIZEWIDTH -SDRATTR_START]=new
SdrAllSizeWidthItem;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index c7a8b96..8f02887 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2245,7 +2245,7 @@ void SdrObject::NbcApplyNotPersistAttr(const SfxItemSet
rAttr)
}
if (rAttr.GetItemState(SDRATTR_OBJECTNAME,true,pPoolItem)==SFX_ITEM_SET) {
-OUString aName=((const SdrObjectNameItem*)pPoolItem)-GetValue();
+OUString aName=((const SfxStringItem*)pPoolItem)-GetValue();
SetName(aName);
}
Rectangle aNewLogic(rLogic);
@@ -2303,7 +2303,7 @@ void SdrObject::TakeNotPersistAttr(SfxItemSet rAttr,
bool bMerge) const
if (!aName.isEmpty())
{
-lcl_SetItem(rAttr, bMerge, SdrObjectNameItem(aName));
+lcl_SetItem(rAttr, bMerge, makeSdrObjectNameItem(aName));
}
lcl_SetItem(rAttr,bMerge,SdrLayerIdItem(GetLayer()));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx |8 +++
bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx | 17 +---
2 files changed, 22 insertions(+), 3 deletions(-)
New commits:
commit 6ab1951ea2e31f47bc9f211dd9b2681c794b8e7f
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 22 15:06:53 2014 +0100
Resolves: rhbz#1125588 ppc64le passes testtools
*bzzt*, lightning arcs, faint smell of ozone, it's alive!
Change-Id: I0b42f4e2603e6d76200d63ab2e26bbb856ae1173
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index dbdef1b..507d3b1 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -545,7 +545,11 @@ extern C void privateSnippetExecutor( ... )
mr %0,1\n\t
: =r (sp) : );
+#if _CALL_ELF == 2
volatile long nRegReturn[1];
+#else
+volatile long nRegReturn[2];
+#endif
typelib_TypeClass aType =
cpp_mediate( nOffsetAndIndex, (void**)gpreg, (void**)fpreg, sp,
(sal_Int64*)nRegReturn);
@@ -588,6 +592,10 @@ extern C void privateSnippetExecutor( ... )
default:
__asm__( ld 3,%0\n\t
: : m (nRegReturn[0]) );
+#if _CALL_ELF == 2
+__asm__( ld 4,%0\n\t
+: : m (nRegReturn[1]) );
+#endif
break;
}
}
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
index aa054d7..391ef219 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
@@ -87,9 +87,9 @@ namespace ppc64
}
}
-void MapReturn(long r3, double dret, typelib_TypeClass eTypeClass, void
*pRegisterReturn)
+void MapReturn(long r3, long r4, double dret,
typelib_TypeDescriptionReference* pReturnType, void *pRegisterReturn)
{
-switch (eTypeClass)
+switch (pReturnType-eTypeClass)
{
case typelib_TypeClass_HYPER:
case typelib_TypeClass_UNSIGNED_HYPER:
@@ -115,6 +115,17 @@ void MapReturn(long r3, double dret, typelib_TypeClass
eTypeClass, void *pRegist
case typelib_TypeClass_DOUBLE:
*reinterpret_castdouble *( pRegisterReturn ) = dret;
break;
+#if _CALL_ELF == 2
+case typelib_TypeClass_STRUCT:
+case typelib_TypeClass_EXCEPTION:
+if (!ppc64::return_in_hidden_param(pReturnType))
+{
+sal_uInt64 *pRegisters =
reinterpret_castsal_uInt64*(pRegisterReturn);
+pRegisters[0] = r3;
+if (pReturnType-pType-nSize 8)
+pRegisters[1] = r4;
+}
+#endif
default:
break;
}
@@ -222,7 +233,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32
nVtableIndex,
fmr%0, 1\n\t
: =f (dret), =r (r3), =r (r4) : );
-MapReturn(r3, dret, pReturnTypeDescr-eTypeClass, pRegisterReturn);
+MapReturn(r3, r4, dret, pReturnTypeRef, pRegisterReturn);
}
// Macros for easier insertion of values to registers or stack
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit b3213401a29c8b4a2b69ee6684531f6d323370b6 Author: Caolán McNamara caol...@redhat.com Date: Fri Aug 22 15:16:10 2014 +0100 pasted in reverse Change-Id: I6a3f8c9bffd2dbac90c73e472f99dd97b9977127 diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx index 507d3b1..35cc16f 100644 --- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx +++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx @@ -546,9 +546,9 @@ extern C void privateSnippetExecutor( ... ) : =r (sp) : ); #if _CALL_ELF == 2 -volatile long nRegReturn[1]; -#else volatile long nRegReturn[2]; +#else +volatile long nRegReturn[1]; #endif typelib_TypeClass aType = ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dictionaries
dictionaries |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 23712bcb7d255a102225a78c0727b3cfb37a9149 Author: Olivier R olivier.nore...@gmail.com Date: Fri Aug 22 15:55:06 2014 +0200 Updated core Project: dictionaries 080424980483bcc29a3556cf1a681c45cd5c50fc diff --git a/dictionaries b/dictionaries index 54aa90e..0804249 16 --- a/dictionaries +++ b/dictionaries @@ -1 +1 @@ -Subproject commit 54aa90ef47bd8e2d062aa455dcc5d6f1ae02887b +Subproject commit 080424980483bcc29a3556cf1a681c45cd5c50fc ___ 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.2.6.3'
Tag 'libreoffice-4.2.6.3' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-08-22 15:22 -0700 Tag libreoffice-4.2.6.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJT91JAAAoJEPQ0oe+v7q6jAMsP/j6q0jIm/00fAM9mz3KTvcAA zjajTXhELECO2zIpiGxcOJu03qpHCGsGc0bqLB1gi5ulVMw4rEUYBFu0mK3aqi1Y qYnje9AJyHkOPEE7VWLTOOc7OxjIwSyMHVfVfHWu4dveMDyj4BuwICJJFb82dqi3 Yrd35l20i9FreYZEEmVxtmjXk8pm0nqp9ggKnBYMDyWermwhkgTCMnu0zbdd+wDs yut582yvTBwQj7UZvJMrtJ1at9vQuDGA4dXxwA5kS+1RdWA1+fu20KgxvgiHprdH 88oHkRHf2Dx6xL3FOzWSIb3k1TyI9lYFO7bGTZNHZI3Knw9ySBtANedmbcdQOnoF J/qktwbpdPz81WV99tahNU3BczRl3ovpEC/Ug68YLFSFOG5HjYYCda3Py1hoo2pn 2MItc1enUUpAvkM60CRP3cw0QJVBE2fvRIH01mX8zrQQWUbJ4CU06ClXe0jHerFC 0R3/lgh7Q90Uw6juu17k+H4pQpP/U9OS7yxtyMgjoDmPAFsykXJ5cZSocdxRPqaC aDD4QLXHpqpJlkxQXvwDWqKI8AzIsbB8hrXIQLwWUl4bTNE/iRWUq4P/0/LLPxlw BKWBtClyOeW2WoSh4aPWmlbxIBE36RVrkWsw0Y3b41N2Ez9lNSQzsIwEN5XX6jiU eRkPZGAmsAZ5zBi3hBRy =0WLQ -END PGP SIGNATURE- Changes since cp-4.2-7-1: --- 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.2.6.3'
Tag 'libreoffice-4.2.6.3' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-08-22 15:22 -0700 Tag libreoffice-4.2.6.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJT91I8AAoJEPQ0oe+v7q6jADwP/1WDcBXZQz8uIWkF5Wi7lvL9 ed3RVA+H0OnzDIU7BMcNJb+cqXZPfwWGPjM78mhCABa1cH+pIiHNHDiiQw4RU/3D YxiUMOIQjQRlJYEi2T6bpMETzN5hcTGjoCzWNs/uOCkn2opCRv17svHoat7JxFBO tJ2T5pM44bd4k5oQ+HCJYEbGQL/rOXHDfhg4PGfNNvQfF54NTZCxXhIeatNieDY0 yEiGwhchIvgj5WSNKQ5QTmKwvHOYZhdmT8wAKcaVdErQIhW6iohNane2nEjaBvbJ KzJ0PzApLAb2JPAq2DEI5+LgqIBOnb1mlfhZJoVTUw439gYWEqa+BlZHuoL2BYMV oPfegS0lv9Arvrfuq87kd5qbxyTSvoZqc48yqP5Nu34XIuhsdhJNckxg+lrZXVsh Fs0WUM/RfsLos/qhX2OhvZcFz5KbvbyKN8jNDmZL4JFSFWMv6eTb7odYMTSdeY9J 7Y8pDGlEnr/9cAEP9wholG6hUXJtOxcciiNYyILWfkAwJ+lIEwcCCqkKBYfdwSGq p/0+eFHoN/kx18QnX7m3fyzFgrfvpS5AexE2QaTPll0bqt6SRxpKzdn2+ycHAeur Ap9SJfQQHQoaWukmvLMZT5+Q8UrHGY6R2GSA34nnDiIQaIWVKAwfaTDPVzqsYgtS GdaMFSPxvF0QUCmoPTrX =aMtl -END PGP SIGNATURE- Changes since cp-4.2-2-7: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-4.2.6.3'
Tag 'libreoffice-4.2.6.3' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-08-22 15:23 -0700 Tag libreoffice-4.2.6.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJT91JHAAoJEPQ0oe+v7q6jMrcQAK6HDZ7v7+ep/Bsq4ghkWxJD 2zNbcwjrlHYUXMS7GqnXnhNF8WiiDGp8jlei+pPwZvqyBmyGBYbu/jq44oODyzLK Zk3/i89Bx+re3nTjXV7bZBfUsvtkEC+1xw8M/5751kYVqGcKazDz2r9QM587sIVL f/FJ1xWFnYbdeXClWXucc2hDV7Xg/HSXpasoacqMN3i5BRFilNKzVNt9AkHoyPGR 67fGEZk0uaaLHO6IJEful+XqiInBlL6J9XQlzCA5bLs+3KYQ/2bzAIKgTjL6zNT9 Qxgi7w0kvswg5azOoCEzMYlkqDxw23SsRtA1sgndp2T3MzZdHulqDHt//Q4iz+4J Eewp+A+x9jPGzO4RmWVt+pyCno6oB9yyvYmRRswYsk2Ij4fYsX0rv0tmzr+ah+sK DPX4xugPrVpNWLA9YivFO4NNzmgzAMtAqVmsHttfQ/8d4jTvSjq6/LHWeCoTZhRJ R5GSZudkh9MNV0zKYAS1FWYchdShIgGYFc0i8hBgwenr8wwpQXKG7pCME6pG9dVC H7c0UbyAPoTGFyqtPKCPR4pYLM/3mukdtJw/Auhx1mEF4CoIcyKX87x8recBHFLU 9EYkWs0APFdzoqU9t8lFUqmT8r8SzMN0PEqPrj3RqCCsLZzPktBKp9EroLPr5hlN vwazivNs13C/+B1hvLbN =ylYH -END PGP SIGNATURE- Changes since cp-4.2-branch-point-577: --- 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.2.6.3'
Tag 'libreoffice-4.2.6.3' created by Christian Lohmaier lohmaier+libreoff...@googlemail.com at 2014-08-22 15:22 -0700 Tag libreoffice-4.2.6.3 -BEGIN PGP SIGNATURE- Version: GnuPG v1 iQIcBAABAgAGBQJT91JDAAoJEPQ0oe+v7q6jlLoQAK5FLobdXGD0kiJRJ5Uuvu/e PTjEFUdN2QGQpJGX2S+hpr0Uirnwb08IVzijSf/Hbn8esBrl7iG+887fdAvCgXCF ogXjsJdMyJWKJ71noBuIBT6ztB3s8ns9rAVKktQ0tOVvcDibjiUBbrtZYM77J2j3 L8nVjxCjI2kpn2n0uKP2E+tKYAKi466jaOf8fCZUhvDJLznqWjq7v1Y8bC96tJvM DaeU7jkSY8iJjP/bY93flZTblfFIfUH+Zsv4Z3WWKkRxOhwMBgEIEULJRBnNFM8Q JHRr07sV/fSsdTMI10VOsD9dfDtHBoy6YUL0TqPonY/0KaTOTbgilwgHkq2y0bCz G3SZ4fcnydDqrxgC8+P6sxQvHKDPL9WHmQDTiAcb3KJlkRdBlB97pn7+y0SbsoiQ Ro46YUM0mCEGS1vEmnzi72gF8JfrpoDYqw/CD1uDqLRpWuDFXcX2GF3I79cL2rAB DxAqyRzhSxIFnctp3ZNs1k7GJdU3ggnUZLUDLiuymGLk7Nasa91Sb9nfamuHcXFE iF6qxCv8UASkOj+I0Q5qvQSqMe6k8cgOr/e9x+3oVv0jgvUEvJouaxJ0mqwgGKG+ 48vhsH0JmtLkqoMsfcZSwGksgUq3HdMNumibYxIY4tTm9oNI4UCsFVKh40ixT6Lq EDiQNnvUOAyamDK9LPPI =dh90 -END PGP SIGNATURE- Changes since libreoffice-4-2-branch-point-21: --- 0 files changed --- ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-6' - 3 commits - comphelper/source configure.ac include/comphelper sfx2/source svtools/source
comphelper/source/container/embeddedobjectcontainer.cxx | 36 ++--
configure.ac|2
include/comphelper/embeddedobjectcontainer.hxx |3
sfx2/source/appl/impldde.cxx| 72 ++--
sfx2/source/appl/linkmgr2.cxx | 12 ++
svtools/source/misc/embedhlp.cxx| 29 --
6 files changed, 74 insertions(+), 80 deletions(-)
New commits:
commit 2da39d30b52820783c4dde33fe53d8614b4b7869
Author: Christian Lohmaier lohmaier+libreoff...@googlemail.com
Date: Fri Aug 22 16:24:51 2014 +0200
bump product version to 4.2.6.3.0+
Change-Id: I6e3127ba77eb9e10fcdcfbb87aa9c07fa275566c
diff --git a/configure.ac b/configure.ac
index bccb62d..440d889 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.2.6.2.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[4.2.6.3.0+],[],[],[http://documentfoundation.org/])
AC_PREREQ([2.59])
commit b92da9e9f3125ef186a29a9644c4197c25c1a521
Author: Herbert Dürr h...@apache.org
Date: Mon Jul 14 07:17:59 2014 +
Related: #i125226# expect DDE servers to be already up
soffice is always up anyway and other DDE apps should be started manually
(cherry picked from commit e0bfdb26cef87c8d3b3435293116a33cf99c11f0)
Conflicts:
sfx2/source/appl/impldde.cxx
(cherry picked from commit f4a8d7cd10cda57143b22519e16cdf8d5f19e759)
Conflicts:
sfx2/source/appl/impldde.cxx
Change-Id: I52ebb26528952a4abf33ac95cb67c598f08b2790
Reviewed-on: https://gerrit.libreoffice.org/10297
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com
(cherry picked from commit 1e7502f3c8b8d751dd851c3f146debf2678781ec)
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index b0b79a21..92b1c7e 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -198,9 +198,6 @@ sal_Bool SvDDEObject::GetData( ::com::sun::star::uno::Any
rData /*out param*/,
sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
{
-#if defined(WNT)
-static sal_Bool bInWinExec = sal_False;
-#endif
sal_uInt16 nLinkType = pSvLink-GetUpdateMode();
if( pConnection ) // Connection is already made
{
@@ -227,69 +224,22 @@ sal_Bool SvDDEObject::Connect( SvBaseLink * pSvLink )
pConnection = new DdeConnection( sServer, sTopic );
if( pConnection-GetError() )
{
- // Is it possible to address the system-Topic?
- // then the server is up, it just does not know the topic!
-if( sTopic.equalsIgnoreAsciiCase( SYSTEM ) )
+// check if the DDE server knows the SYSTEM topic
+bool bSysTopic = false;
+if (!sTopic.equalsIgnoreAsciiCase(SYSTEM))
{
-sal_Bool bSysTopic;
-{
-DdeConnection aTmp(sServer, OUString(SYSTEM));
-bSysTopic = !aTmp.GetError();
-}
-
-if( bSysTopic )
-{
-nError = DDELINK_ERROR_DATA;
-return sal_False;
-}
-// otherwise in Win/WinNT, start the Application directly
+DdeConnection aTmp(sServer, OUString(SYSTEM));
+bSysTopic = !aTmp.GetError();
}
-#if defined(WNT)
-// check the suitability of starting the DDE server
-const SvtSecurityOptions aSecOpts;
-bool bForbidden = (aSecOpts.GetMacroSecurityLevel() == eNEVER_EXECUTE);
-bForbidden |= (comphelper::string::indexOfAny(sServer, L:./%\\) !=
-1);
-static const char* aBadServers[] = { cmd, rundll32 };
-for (size_t i = 0; i sizeof(aBadServers)/sizeof(*aBadServers); ++i)
-bForbidden |= sServer.equalsAscii(aBadServers[i]);
-
-// try to start the DDE server if it is not there already
-bForbidden |= (bInWinExec != false);
-if( !bForbidden )
+if( bSysTopic )
{
-OStringBuffer aCmdLine(OUStringToOString(sServer,
RTL_TEXTENCODING_ASCII_US));
-aCmdLine.append(.exe );
-aCmdLine.append(OUStringToOString(sTopic,
RTL_TEXTENCODING_ASCII_US));
-
-if( WinExec( aCmdLine.getStr(), SW_SHOWMINIMIZED ) 32 ) // TODO:
use CreateProcess() instead
-nError = DDELINK_ERROR_APP;
-else
-{
-sal_uInt16 i;
-for( i=0; i5; i++ )
-{
-bInWinExec = sal_True;
-Application::Reschedule();
-bInWinExec = sal_False;
-
-delete pConnection;
-pConnection = new
[Libreoffice-commits] dictionaries.git: 2 commits - en/Lightproof.py hu_HU/Lightproof.py pt_BR/Lightproof.py ru_RU/Lightproof.py ru_RU/pythonpath ru_RU/README_Lightproof_ru_RU.txt
en/Lightproof.py |5 + hu_HU/Lightproof.py |6 ++ pt_BR/Lightproof.py |6 ++ ru_RU/Lightproof.py |6 ++ ru_RU/README_Lightproof_ru_RU.txt |2 +- ru_RU/pythonpath/lightproof_impl_ru_RU.py |8 +--- ru_RU/pythonpath/lightproof_opts_ru_RU.py |4 ++-- ru_RU/pythonpath/lightproof_ru_RU.py |3 +-- 8 files changed, 32 insertions(+), 8 deletions(-) New commits: commit 080424980483bcc29a3556cf1a681c45cd5c50fc Author: Olivier R olivier.nore...@gmail.com Date: Fri Aug 22 15:55:06 2014 +0200 Lightproof: restore paragraph based proofreading Instead of the sentences suggested by the incomplete sentence boundary detection of LibreOffice (enabled in version 4), Lightproof works on full paragraph text again, allowing more precise analysis of the text. See http://nabble.documentfoundation.org/Grammar-checker-Undocumented-change-in-the-API-for-LO-4-td4030639.html Change-Id: Ifc967e5b3f27da5b0edeebdb73b8f0b97c938280 diff --git a/en/Lightproof.py b/en/Lightproof.py index e2974fd..e7cde2f 100644 --- a/en/Lightproof.py +++ b/en/Lightproof.py @@ -77,6 +77,11 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer aRes.aProperties = () aRes.xProofreader = self aRes.aErrors = () +# PATCH FOR LO 4 +# Fix for http://nabble.documentfoundation.org/Grammar-checker-Undocumented-change-in-the-API-for-LO-4-td4030639.html +if nStartOfSentencePos != 0: +return aRes +aRes.nStartOfNextSentencePosition = len(rText) if len(rProperties) 0 and rProperties[0].Name == Update: try: import lightproof_compile_en diff --git a/hu_HU/Lightproof.py b/hu_HU/Lightproof.py index 74af535..e5936b8 100644 --- a/hu_HU/Lightproof.py +++ b/hu_HU/Lightproof.py @@ -77,6 +77,12 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer aRes.aProperties = () aRes.xProofreader = self aRes.aErrors = () +# PATCH FOR LO 4 +# Fix for http://nabble.documentfoundation.org/Grammar-checker-Undocumented-change-in-the-API-for-LO-4-td4030639.html +if nStartOfSentencePos != 0: +return aRes +aRes.nStartOfNextSentencePosition = len(rText) +# END OF PATCH if len(rProperties) 0 and rProperties[0].Name == Update: try: import lightproof_compile_hu_HU diff --git a/pt_BR/Lightproof.py b/pt_BR/Lightproof.py index 1090ca2..44f6934 100644 --- a/pt_BR/Lightproof.py +++ b/pt_BR/Lightproof.py @@ -77,6 +77,12 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer aRes.aProperties = () aRes.xProofreader = self aRes.aErrors = () +# PATCH FOR LO 4 +# Fix for http://nabble.documentfoundation.org/Grammar-checker-Undocumented-change-in-the-API-for-LO-4-td4030639.html +if nStartOfSentencePos != 0: +return aRes +aRes.nStartOfNextSentencePosition = len(rText) +# END OF PATCH if len(rProperties) 0 and rProperties[0].Name == Update: try: import lightproof_compile_pt_BR diff --git a/ru_RU/Lightproof.py b/ru_RU/Lightproof.py index 229b704..4af25f8 100644 --- a/ru_RU/Lightproof.py +++ b/ru_RU/Lightproof.py @@ -77,6 +77,12 @@ class Lightproof( unohelper.Base, XProofreader, XServiceInfo, XServiceName, XSer aRes.aProperties = () aRes.xProofreader = self aRes.aErrors = () +# PATCH FOR LO 4 +# Fix for http://nabble.documentfoundation.org/Grammar-checker-Undocumented-change-in-the-API-for-LO-4-td4030639.html +if nStartOfSentencePos != 0: +return aRes +aRes.nStartOfNextSentencePosition = len(rText) +# END OF PATCH if len(rProperties) 0 and rProperties[0].Name == Update: try: import lightproof_compile_ru_RU commit 4e468c8b15cb93fd2b30c9645563a43bddc643b2 Author: Yakov Reztsov yr at myooo dot ru Date: Fri Aug 22 15:42:17 2014 +0200 update Russian proofreading rules Change-Id: Iedc3af5671241a6e9202916c0a813f0f91303e8f diff --git a/ru_RU/README_Lightproof_ru_RU.txt b/ru_RU/README_Lightproof_ru_RU.txt index caa4fff..9c5dbb0 100644 --- a/ru_RU/README_Lightproof_ru_RU.txt +++ b/ru_RU/README_Lightproof_ru_RU.txt @@ -3,5 +3,5 @@ Russian grammar checker (developed by the Lightproof grammar checker extension generator, see http://launchpad.net/lightproof) -2009, 2011, 2012 (c) Yakov Reztsov yr at myooo dot ru, license: MPL 1.1 / GPL / LGPL +2009, 2011, 2012, 2014 (c) Yakov Reztsov yr at myooo dot ru, license: MPL 1.1 / GPL / LGPL diff --git a/ru_RU/pythonpath/lightproof_impl_ru_RU.py b/ru_RU/pythonpath/lightproof_impl_ru_RU.py index 0537d24..22eb59e
[Libreoffice-commits] core.git: writerfilter/source
writerfilter/source/dmapper/BorderHandler.cxx |9 ++---
writerfilter/source/dmapper/BorderHandler.hxx |3 ++-
2 files changed, 4 insertions(+), 8 deletions(-)
New commits:
commit 9767f9becc689be6405dbbfc6cd9921d8cbac4d3
Author: Miklos Vajna vmik...@collabora.co.uk
Date: Fri Aug 22 16:32:46 2014 +0200
Use comphelper::SequenceAsVector
Change-Id: I115b17da8cc246bf1b2502ed53ef00edad70a21d
diff --git a/writerfilter/source/dmapper/BorderHandler.cxx
b/writerfilter/source/dmapper/BorderHandler.cxx
index 7e03c3d..68418b8 100644
--- a/writerfilter/source/dmapper/BorderHandler.cxx
+++ b/writerfilter/source/dmapper/BorderHandler.cxx
@@ -135,7 +135,7 @@ void BorderHandler::lcl_sprm(Sprm rSprm)
writerfilter::ReferenceProperties::Pointer_t pProperties =
rSprm.getProps();
if( pProperties.get())
{
-std::vectorbeans::PropertyValue aSavedGrabBag;
+comphelper::SequenceAsVectorbeans::PropertyValue aSavedGrabBag;
if (!m_aInteropGrabBagName.isEmpty())
{
aSavedGrabBag = m_aInteropGrabBag;
@@ -202,12 +202,7 @@ beans::PropertyValue
BorderHandler::getInteropGrabBag(const OUString aName)
else
aRet.Name = aName;
-uno::Sequencebeans::PropertyValue aSeq(m_aInteropGrabBag.size());
-beans::PropertyValue* pSeq = aSeq.getArray();
-for (std::vectorbeans::PropertyValue::iterator i =
m_aInteropGrabBag.begin(); i != m_aInteropGrabBag.end(); ++i)
-*pSeq++ = *i;
-
-aRet.Value = uno::makeAny(aSeq);
+aRet.Value = uno::makeAny(m_aInteropGrabBag.getAsConstList());
return aRet;
}
diff --git a/writerfilter/source/dmapper/BorderHandler.hxx
b/writerfilter/source/dmapper/BorderHandler.hxx
index 0368a93..4f2ce9c 100644
--- a/writerfilter/source/dmapper/BorderHandler.hxx
+++ b/writerfilter/source/dmapper/BorderHandler.hxx
@@ -24,6 +24,7 @@
#include boost/shared_ptr.hpp
#include com/sun/star/table/BorderLine2.hpp
#include com/sun/star/beans/PropertyValue.hpp
+#include comphelper/sequenceasvector.hxx
namespace writerfilter {
namespace dmapper
@@ -57,7 +58,7 @@ private:
boolm_aFilledLines[BORDER_COUNT];
::com::sun::star::table::BorderLine2m_aBorderLines[BORDER_COUNT];
OUString m_aInteropGrabBagName;
-std::vectorcss::beans::PropertyValue m_aInteropGrabBag;
+comphelper::SequenceAsVectorcss::beans::PropertyValue m_aInteropGrabBag;
void appendGrabBag(const OUString aKey, const OUString aValue);
// Properties
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Fwd: Performance samples de-virtualization for LibreOffice ...
Hi guys, So Jan has been doing awesome work as normal on pre-linking and optimization =) It'd be great to let others see / get involved / help out there, hence fwding it to the list; prolly a better place for the discussion. Thanks Jan ! Michael. Forwarded Message From: Jan Hubicka hubi...@ucw.cz To: Michael Meeks michael.me...@collabora.com Cc: Jan Hubicka hubi...@ucw.cz, Matúš Kukan matus.ku...@collabora.co.uk Subject: Re: Performance samples for LibreOffice ... Date: Thu, 21 Aug 2014 15:56:26 +0200 Hi Jan, Any chance I can share this with the list ? ... Feel free to share the list. I am not sure if you want to annotate all types/methods from the list (because the fact they have no derived types may depend on configuration/plugins/etc)- I would sort of expect these to need manual inspection... Honza ... On Thu, 2014-08-21 at 05:58 +0200, Jan Hubicka wrote: Hi, after another break I got back to play with libreoffice. I still did not worked out how to build LO with profile feedback (avoid the TLS model conflict) but fixed GCC mainline to build it at least and got the compilation noticeably faster ;) I was recently working on warning that would suggest adding final keywords to types and methods to allow better devirtualization. Here are warnings I get for libmerge (from February tree, sorry) http://kam.mff.cuni.cz/~hubicka/final-warnings-libreoffice.txt (search also for -Wsuggest-final-methods) Overall I get: 107730 polymorphic calls, 0 devirtualized, 20787 speculatively devirtualized, 31324 cold 53983 have multiple targets, 0 overwritable, 0 already speculated (0 agree, 0 disagree), 1 external, 351 not defined, 0 artificial good portion of the 20787 calls that do get devirtualized would be turned to direct calls if all the annotations was added :) Honza On Fri, 2014-08-22 at 08:11 +0200, Jan Hubicka wrote: Michael, I also played bit more with the profile guided optimization problem. The issue is that all unit tests fails becuase of cannot load any more object with static TLS. I do not really get why this happens - while GCC profling runtime does use TLS, I am quite sure it is global-dynamic. Anyway a hack around is: CPPUNITTRACE=LD_PRELOAD=/aux/hubicka/libreoffice/50-fdo/instdir/program/libmergedlo.so This makes dynamic linker to allocate enought of the DTV slosts. Still easier than recompiling glibc with increased DTV surplus. Any idea where are the DTV slots go? Actual main reason to email you was because I wrote a bit about the final warnings here http://hubicka.blogspot.ca/2014/08/devirtualization-in-c-part-5-asking.html I would be happy to know if they seem useful for LO. -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: sw/source
sw/source/core/doc/ftnidx.cxx |2 +- sw/source/filter/ww8/ww8atr.cxx |2 +- 2 files changed, 2 insertions(+), 2 deletions(-) New commits: commit 53ce805b436d65f35c815ca5355aa5e7dd579e64 Author: Stephan Bergmann sberg...@redhat.com Date: Fri Aug 22 17:01:51 2014 +0200 Avoid unnecessary invalid downcasts ...to SwFmtFtnAtTxtEnd instead of SwFmtEndAtTxtEnd, both derived from SwFmtFtnEndAtTxtEnd Change-Id: I4b909f136268058bedeacd6b47d3f4cd88522ad5 diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx index 8858cfa..c0b57cd 100644 --- a/sw/source/core/doc/ftnidx.cxx +++ b/sw/source/core/doc/ftnidx.cxx @@ -283,7 +283,7 @@ const SwSectionNode* SwUpdFtnEndNtAtEnd::FindSectNdWithEndAttr( sal_uInt16 nVal; const SwSectionNode* pNd = rTxtFtn.GetTxtNode().FindSectionNode(); while( pNd FTNEND_ATTXTEND_OWNNUMSEQ != ( nVal = -((const SwFmtFtnAtTxtEnd)pNd-GetSection().GetFmt()- +((const SwFmtFtnEndAtTxtEnd)pNd-GetSection().GetFmt()- GetFmtAttr( nWh, true )).GetValue() ) FTNEND_ATTXTEND_OWNNUMANDFMT != nVal ) pNd = pNd-StartOfSectionNode()-FindSectionNode(); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 8813399..5e8de51 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -3340,7 +3340,7 @@ static bool lcl_IsAtTxtEnd(const SwFmtFtn rFtn) const SwSectionNode* pSectNd = rFtn.GetTxtFtn()-GetTxtNode(). FindSectionNode(); while( pSectNd FTNEND_ATPGORDOCEND == -((const SwFmtFtnAtTxtEnd)pSectNd-GetSection().GetFmt()- +((const SwFmtFtnEndAtTxtEnd)pSectNd-GetSection().GetFmt()- GetFmtAttr( nWh, true)).GetValue() ) pSectNd = pSectNd-StartOfSectionNode()-FindSectionNode(); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: svx/source
svx/source/customshapes/EnhancedCustomShape2d.cxx |2 +-
svx/source/svdraw/svdobj.cxx |6 --
2 files changed, 5 insertions(+), 3 deletions(-)
New commits:
commit 720ee909292db389606511d6fac75ad03d72d695
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 22 17:17:52 2014 +0200
Point and Rectangle coordinates are long, not sal_Int32
Change-Id: I0f97d12f55e506af699976bf81f4dcf956195aab
diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx
b/svx/source/customshapes/EnhancedCustomShape2d.cxx
index 175b2a0..df29afc 100644
--- a/svx/source/customshapes/EnhancedCustomShape2d.cxx
+++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx
@@ -963,7 +963,7 @@ Point EnhancedCustomShape2d::GetPoint( const
com::sun::star::drawing::EnhancedCu
if ( nFlags DFF_CUSTOMSHAPE_FLIP_H )
fVal = aLogicRect.GetWidth() - fVal;
}
-aRetValue.X() = (sal_Int32)fVal;
+aRetValue.X() = static_castlong(fVal);
}
}
while ( ++nPass 2 );
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 8f02887..dc2d8d8 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -972,8 +972,10 @@ void SdrObject::RecalcBoundRect()
if(!aRange.isEmpty())
{
aOutRect = Rectangle(
-(sal_Int32)floor(aRange.getMinX()),
(sal_Int32)floor(aRange.getMinY()),
-(sal_Int32)ceil(aRange.getMaxX()),
(sal_Int32)ceil(aRange.getMaxY()));
+static_castlong(floor(aRange.getMinX())),
+static_castlong(floor(aRange.getMinY())),
+static_castlong(ceil(aRange.getMaxX())),
+static_castlong(ceil(aRange.getMaxY(;
aOutRect -= GetGridOffset(); // don't include grid offset
return;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 4 commits - editeng/source include/editeng include/unotools sw/inc sw/source unotools/source vcl/inc vcl/source
editeng/source/misc/SvXMLAutoCorrectImport.cxx |2
editeng/source/misc/svxacorr.cxx | 11 +--
include/editeng/svxacorr.hxx |2
include/unotools/fontdefs.hxx |2
sw/inc/swacorr.hxx |2
sw/source/core/sw3io/swacorr.cxx |4 -
unotools/source/misc/fontcvt.cxx | 10 +--
unotools/source/misc/fontdefs.cxx | 11 ++-
vcl/inc/PhysicalFontCollection.hxx |1
vcl/source/font/PhysicalFontCollection.cxx | 76 ++---
vcl/source/font/PhysicalFontFamily.cxx | 11 +++
vcl/source/gdi/font.cxx|4 -
vcl/source/outdev/font.cxx | 17 +
13 files changed, 74 insertions(+), 79 deletions(-)
New commits:
commit 8d6697587776136f3121733e1c29d4200720dbd9
Author: Michael Meeks michael.me...@collabora.com
Date: Fri Aug 22 00:37:46 2014 +0100
fdo#79761 - avoid re-canonicalising each font name on clone repeatedly.
Change-Id: I5b32787943ab3f824249359e9924eae25ba5783b
diff --git a/vcl/source/font/PhysicalFontFamily.cxx
b/vcl/source/font/PhysicalFontFamily.cxx
index 3cba470..6307ac0 100644
--- a/vcl/source/font/PhysicalFontFamily.cxx
+++ b/vcl/source/font/PhysicalFontFamily.cxx
@@ -281,6 +281,10 @@ void PhysicalFontFamily::GetFontHeights( std::setint
rHeights ) const
void PhysicalFontFamily::UpdateCloneFontList( PhysicalFontCollection
rFontCollection,
bool bScalable, bool bEmbeddable
) const
{
+// This is rather expensive to do per face.
+OUString aFamilyName = GetEnglishSearchFontName( GetFamilyName() );
+PhysicalFontFamily* pFamily = rFontCollection.FindOrCreateFamily(
aFamilyName );
+
for( PhysicalFontFace* pFace = mpFirst; pFace; pFace =
pFace-GetNextFace() )
{
if( bScalable !pFace-IsScalable() )
@@ -289,7 +293,12 @@ void PhysicalFontFamily::UpdateCloneFontList(
PhysicalFontCollection rFontColle
continue;
PhysicalFontFace* pClonedFace = pFace-Clone();
-rFontCollection.Add( pClonedFace );
+
+assert( pClonedFace-GetFamilyName() == GetFamilyName() );
+assert( rFontCollection.FindOrCreateFamily( GetEnglishSearchFontName(
pClonedFace-GetFamilyName() ) ) == pFamily );
+
+if (! pFamily-AddFontFace( pClonedFace ) )
+delete pClonedFace;
}
}
commit 46ac7d60dde9a09239709716efcfcf66dd0e0a85
Author: Michael Meeks michael.me...@collabora.com
Date: Fri Aug 22 00:08:04 2014 +0100
font lookup - cleanup GetEnglishSearchName function signature.
Change-Id: I6e3ca358d88e0285fe6e07b0617f3078a5edb857
diff --git a/include/unotools/fontdefs.hxx b/include/unotools/fontdefs.hxx
index 6e20b88..7ac715e 100644
--- a/include/unotools/fontdefs.hxx
+++ b/include/unotools/fontdefs.hxx
@@ -81,7 +81,7 @@ public:
UNOTOOLS_DLLPUBLIC OUString GetNextFontToken( const OUString rTokenStr,
sal_Int32 rIndex );
-UNOTOOLS_DLLPUBLIC void GetEnglishSearchFontName( OUString rName );
+UNOTOOLS_DLLPUBLIC OUString GetEnglishSearchFontName( const OUString rName );
/** Determine if the font is the special Star|Open Symbol font
diff --git a/unotools/source/misc/fontcvt.cxx b/unotools/source/misc/fontcvt.cxx
index 1cb82c1..f91ab9a 100644
--- a/unotools/source/misc/fontcvt.cxx
+++ b/unotools/source/misc/fontcvt.cxx
@@ -1412,11 +1412,10 @@ static ConvertChar aImplStarSymbolCvt = { NULL,
StarBats, ImplStarSymbolToStar
const ConvertChar* ConvertChar::GetRecodeData( const OUString rOrgFontName,
const OUString rMapFontName )
{
const ConvertChar* pCvt = NULL;
-OUString aOrgName( rOrgFontName );
-GetEnglishSearchFontName( aOrgName );
-OUString aMapName( rMapFontName );
+
// clean up and lowercase font name
-GetEnglishSearchFontName( aMapName );
+OUString aOrgName( GetEnglishSearchFontName( rOrgFontName ) );
+OUString aMapName( GetEnglishSearchFontName( rMapFontName ) );
if( aMapName == starsymbol
|| aMapName == opensymbol )
@@ -1457,8 +1456,7 @@ FontToSubsFontConverter CreateFontToSubsFontConverter(
const OUString rOrgName,
{
const ConvertChar* pCvt = NULL;
-OUString aName = rOrgName;
-GetEnglishSearchFontName( aName );
+OUString aName = GetEnglishSearchFontName( rOrgName );
if ( nFlags FONTTOSUBSFONT_IMPORT )
{
diff --git a/unotools/source/misc/fontdefs.cxx
b/unotools/source/misc/fontdefs.cxx
index 4a45fce..3b6b722 100644
--- a/unotools/source/misc/fontdefs.cxx
+++ b/unotools/source/misc/fontdefs.cxx
@@ -320,8 +320,10 @@ static ImplLocalizedFontName aImplLocalizedNamesList[] =
{ NULL, NULL },
};
-void GetEnglishSearchFontName( OUString rName )
+OUString GetEnglishSearchFontName( const OUString rInName )
{
+OUString rName( rInName );
+
boolbNeedTranslation = false;
sal_Int32 nLen = rName.getLength();
@@ -438,6
Re: Performance samples for LibreOffice ...
Hi Matus, Any chance you can fix / commit this one ? :-) Jan - wow - that is a nice error =) are there any other ODR issues ? they habitually bite us hard so ... great to get libmerged debugged even more. CC'ing the list too. Thanks ! Michael. On Fri, 2014-08-22 at 17:05 +0200, Jan Hubicka wrote: Hi, this is another warning that may be worth fixing /aux/hubicka/libreoffice/sc/source/ui/vba/vbastyles.cxx:68:7: warning: type �struct EnumWrapper� violates one definition rule [-Wodr] class EnumWrapper : public EnumerationHelper_BASE ^ /aux/hubicka/libreoffice/sc/source/ui/vba/vbaoleobjects.cxx:74:7: note: a different type is defined in another translation unit class EnumWrapper : public EnumerationHelper_BASE ^ /aux/hubicka/libreoffice/sc/source/ui/vba/vbastyles.cxx:70:50: note: the first difference of corresponding definitions is field �m_xIndexAccess� uno::Referencecontainer::XIndexAccess m_xIndexAccess; ^ /aux/hubicka/libreoffice/sc/source/ui/vba/vbaoleobjects.cxx:77:43: note: a field with different name is defined in another translation unit uno::ReferenceXHelperInterface m_xParent; -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: tools/source
tools/source/generic/poly.cxx | 16
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 3f89eccf7e4a0a398a02624e2478de805723f92b
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 22 17:30:03 2014 +0200
Do not cripple intermediate values to sal_uInt16
Change-Id: I5d39bebbd55cc3170ff52459731fad333a2e92f9
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx
index 2447271..e5ed7f2 100644
--- a/tools/source/generic/poly.cxx
+++ b/tools/source/generic/poly.cxx
@@ -416,10 +416,10 @@ Polygon::Polygon( const Point rCenter, long nRadX, long
nRadY, sal_uInt16 nPoin
// Compute default (depends on size)
if( !nPoints )
{
-nPoints = (sal_uInt16) ( F_PI * ( 1.5 * ( nRadX + nRadY ) -
- sqrt( (double) labs( nRadX * nRadY ) ) ) );
-
-nPoints = (sal_uInt16) MinMax( nPoints, 32, 256 );
+nPoints = (sal_uInt16) MinMax(
+( F_PI * ( 1.5 * ( nRadX + nRadY ) -
+ sqrt( (double) labs( nRadX * nRadY ) ) ) ),
+32, 256 );
if( ( nRadX 32 ) ( nRadY 32 ) ( nRadX + nRadY ) 8192 )
nPoints = 1;
@@ -471,10 +471,10 @@ Polygon::Polygon( const Rectangle rBound, const Point
rStart, const Point rEn
const long nRadY = aCenter.Y() - rBound.Top();
sal_uInt16 nPoints;
-nPoints = (sal_uInt16) ( F_PI * ( 1.5 * ( nRadX + nRadY ) -
- sqrt( (double) labs( nRadX * nRadY ) ) ) );
-
-nPoints = (sal_uInt16) MinMax( nPoints, 32, 256 );
+nPoints = (sal_uInt16) MinMax(
+( F_PI * ( 1.5 * ( nRadX + nRadY ) -
+ sqrt( (double) labs( nRadX * nRadY ) ) ) ),
+32, 256 );
if( ( nRadX 32 ) ( nRadY 32 ) ( nRadX + nRadY ) 8192 )
nPoints = 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/draw/dcontact.cxx |2 +-
sw/source/core/inc/frame.hxx |3 +++
sw/source/core/layout/ssfrm.cxx |2 ++
sw/source/core/layout/wsfrm.cxx |1 +
4 files changed, 7 insertions(+), 1 deletion(-)
New commits:
commit 4970d562b65d06790b816ff65daef890a7619446
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 22 17:37:15 2014 +0200
Prevent downcast to SwTxtFrm when already in ~SwFrm superclass dtor
...as done in SwAnchoredObject::FindAnchorCharFrm
(sw/source/core/layout/anchoredobject.cxx) during
CppunitTest_sw_ooxmlexport5:
SwAnchoredObject::FindAnchorCharFrm
SwAnchoredObject::GetAnchorFrmContainingAnchPos
SwAnchoredObject::FindPageFrmOfAnchor
lcl_NotifyBackgroundOfObj
SwDrawContact::DisconnectFromLayout
SwDrawContact::DisconnectObjFromLayout
SwFrm::Destroy
SwFrm::~SwFrm
SwCntntFrm::~SwCntntFrm
SwTxtFrm::~SwTxtFrm
SwTxtFrm::~SwTxtFrm
SwLayoutFrm::Destroy
SwLayoutFrm::~SwLayoutFrm
SwCellFrm::~SwCellFrm
SwCellFrm::~SwCellFrm
SwLayoutFrm::Destroy
SwLayoutFrm::~SwLayoutFrm
SwRowFrm::~SwRowFrm
SwRowFrm::~SwRowFrm
SwLayoutFrm::Destroy
SwLayoutFrm::~SwLayoutFrm
SwTabFrm::~SwTabFrm
SwTabFrm::~SwTabFrm
SwFlyFrm::DeleteCnt
SwFlyFrm::~SwFlyFrm
SwFlyFreeFrm::~SwFlyFreeFrm
SwFlyAtCntFrm::~SwFlyAtCntFrm
SwFlyAtCntFrm::~SwFlyAtCntFrm
SwLayoutFrm::Destroy
SwLayoutFrm::~SwLayoutFrm
SwBodyFrm::~SwBodyFrm
SwBodyFrm::~SwBodyFrm
SwLayoutFrm::Destroy
SwLayoutFrm::~SwLayoutFrm
SwFtnBossFrm::~SwFtnBossFrm
SwPageFrm::~SwPageFrm
SwPageFrm::~SwPageFrm
SwLayoutFrm::Destroy
SwRootFrm::~SwRootFrm
SwRootFrm::~SwRootFrm
boost::checked_deleteSwRootFrm
boost::detail::sp_counted_impl_pSwRootFrm::dispose
boost::detail::sp_counted_base::release
boost::detail::shared_count::~shared_count
boost::shared_ptrSwRootFrm::~shared_ptr
SwViewShell::~SwViewShell
SwCrsrShell::~SwCrsrShell
SwEditShell::~SwEditShell
SwFEShell::~SwFEShell
SwWrtShell::~SwWrtShell
SwWrtShell::~SwWrtShell
SwView::~SwView
SwView::~SwView
SfxViewFrame::ReleaseObjectShell_Impl
SfxViewFrame::~SfxViewFrame
SfxViewFrame::~SfxViewFrame
SfxViewFrame::Close
SfxFrame::DoClose_Impl
SfxBaseController::dispose
(anonymous namespace)::Frame::setComponent
(anonymous namespace)::Frame::close
SfxFrame::DoClose
SfxViewFrame::Notify
SfxBroadcaster::Broadcast
SfxModelListener_Impl::notifyClosing
SfxBaseModel::close
SwXTextDocument::close
SfxBaseModel::dispose
SwXTextDocument::dispose
SwModelTestBase::tearDown
...
Change-Id: I4c00fa8eebf0346a2bad81a9e362cd901555bbf0
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index ed56e91..1eec8a3 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -1597,7 +1597,7 @@ void SwDrawContact::DisconnectFromLayout( bool
_bMoveMasterToInvisibleLayer )
// -- #i36181# - notify background of drawing object
if ( _bMoveMasterToInvisibleLayer
!(GetFmt()-GetDoc()-IsInDtor())
- GetAnchorFrm() )
+ GetAnchorFrm() !GetAnchorFrm()-IsInDtor() )
{
const Rectangle aOldRect(
maAnchoredDrawObj.GetObjRectWithSpaces().SVRect() );
lcl_NotifyBackgroundOfObj( *this, *GetMaster(), aOldRect );
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 0d9ac84..2f0a19c 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -260,6 +260,7 @@ class SwFrm: public SwClient, public SfxBroadcaster
static SwCache *mpCache;
bool mbIfAccTableShouldDisposing;
+bool mbInDtor;
// #i65250#
// frame ID is now in general available - used for layout loop control
@@ -846,6 +847,8 @@ public:
virtual ~SwFrm();
+bool IsInDtor() const { return mbInDtor; }
+
// No inline cause we need the function pointers
long GetTopMargin() const;
long GetBottomMargin() const;
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index e1cb418..4abedc5 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -338,6 +338,8 @@ Point SwFrm::GetFrmAnchorPos( bool
bIgnoreFlysAnchoredAtThisFrame ) const
void SwFrm::Destroy()
{
+mbInDtor = true;
+
// accessible objects for fly and cell frames have been already disposed
// by the destructors of the derived classes.
if( IsAccessibleFrm() !(IsFlyFrm() || IsCellFrm()) GetDep() )
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index f62a056..3261ff6 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -71,6 +71,7 @@ using namespace ::com::sun::star;
SwFrm::SwFrm( SwModify *pMod, SwFrm* pSib ) :
SwClient( pMod ),
mbIfAccTableShouldDisposing( false ), //A member
[Libreoffice-commits] core.git: configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 4eaf127447189c181d3472cdb0bd0c7009ceaccc Author: Tor Lillqvist t...@collabora.com Date: Fri Aug 22 18:30:13 2014 +0300 Don't add a bogus C:/cygwin64/lib/x86 (or similar) directory to ILIB If we don't know of any separate DirectX SDK library, don't use the $DIRECTXSDK_LIB variable which is bogus at that point. Thanks to Nicholas Ferguson for noticing. Change-Id: I333478da7757694ca9236fd485e93bbd88305278 diff --git a/configure.ac b/configure.ac index ef3abc2..370ae6e 100644 --- a/configure.ac +++ b/configure.ac @@ -12830,7 +12830,7 @@ if test $build_os = cygwin; then fi ILIB=$ILIB;$DOTNET_FRAMEWORK_HOME/lib -if test $ENABLE_DIRECTX = TRUE; then +if test $ENABLE_DIRECTX = TRUE -a $HAVE_DIRECTXSDK_LIB = yes; then ILIB=$ILIB;$DIRECTXSDK_LIB fi AC_SUBST(ILIB) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-1' - sd/source
sd/source/ui/func/fuinsert.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit fed76fcf73fc06f8bc547ee5511768e3ddfa8356 Author: Zolnai Tamás tamas.zol...@collabora.com Date: Tue Aug 19 10:09:02 2014 +0200 Fix Insert 3D Model file dialog's All supported formats filter It seems on some system the file dialog does not like spaces between the formats. (cherry picked from commit fd63ba45742e0886f15f907c03025b9dcc84d8ab) Conflicts: sd/source/ui/func/fuinsert.cxx Change-Id: Ifa69f4f210061209f7f0aa9223417d06b06b577a Reviewed-on: https://gerrit.libreoffice.org/11015 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com Reviewed-by: David Tardon dtar...@redhat.com Reviewed-by: Eike Rathke er...@redhat.com diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index e3fbd43..cd03700 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -789,7 +789,7 @@ void FuInsert3DModel::DoExecute( SfxRequest ) sfx2::FileDialogHelper aDlg( ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 ); aDlg.SetTitle( Insert 3D Model ); -aDlg.AddFilter( All supported formats, *.json; *.dae; *.kmz ); +aDlg.AddFilter( All supported formats, *.json;*.dae;*.kmz ); aDlg.AddFilter( JSON - GL Transmission Format, *.json ); aDlg.AddFilter( DAE - COLLADA, *.dae ); aDlg.AddFilter( KMZ - Keyhole Markup language Zipped, *.kmz ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/source
sc/source/core/tool/token.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 5ef430a700e67c4e5029f5af553c0ce8230b6e74 Author: Eike Rathke er...@redhat.com Date: Fri Aug 22 12:59:47 2014 +0200 resolved fdo#82936 do not clear the 3D flag on refupdate Change-Id: I2ae1368a2ffc20e988ff3ab66590a9f98902b862 (cherry picked from commit 75aad687cb5e63a41303aea568bf68b2b5f15d31) Reviewed-on: https://gerrit.libreoffice.org/11066 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index a036c5b..ab7ebe4 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -2857,7 +2857,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( } rRef.SetAddress(aAbs, rNewPos); -rRef.SetFlag3D(b3DFlag); +if (b3DFlag) +rRef.SetFlag3D(b3DFlag); } break; case svDoubleRef: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] help.git: AllLangHelp_scalc.mk source/text
AllLangHelp_scalc.mk|1 source/text/scalc/01/stat_data.xhp | 386 source/text/scalc/01/statistics.xhp | 1729 +++- 3 files changed, 1879 insertions(+), 237 deletions(-) New commits: commit ba90edc72a3eedc95f2a2bd2c6923b860cc3e4d8 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Wed Aug 20 21:36:38 2014 -0300 Fix fdo#80338 Help pages for Data Statistics This is a text to get a mimnimum help for Calc Data Statistics. It can be improved with better english and better maths. Change-Id: I3771ed89c560df1e4e23835f5a15d8cfc47282cd Reviewed-on: https://gerrit.libreoffice.org/11051 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/AllLangHelp_scalc.mk b/AllLangHelp_scalc.mk index 07ca0ad..69ba36e 100644 --- a/AllLangHelp_scalc.mk +++ b/AllLangHelp_scalc.mk @@ -207,6 +207,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,scalc,\ helpcontent2/source/text/scalc/01/solver \ helpcontent2/source/text/scalc/01/solver_options \ helpcontent2/source/text/scalc/01/statistics \ +helpcontent2/source/text/scalc/01/stat_data \ helpcontent2/source/text/scalc/01/text2columns \ helpcontent2/source/text/scalc/02/0213 \ helpcontent2/source/text/scalc/02/0214 \ diff --git a/source/text/scalc/01/stat_data.xhp b/source/text/scalc/01/stat_data.xhp new file mode 100644 index 000..5263a70 --- /dev/null +++ b/source/text/scalc/01/stat_data.xhp @@ -0,0 +1,386 @@ +?xml version=1.0 encoding=UTF-8? +!-- + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the License); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + -- +helpdocument version=1.0 + body +section id=data + paragraph id=hd_id200820141553364965 role=heading xml-lang=en-US level=3Data/paragraph + paragraph id=par_id2008201415533682345 role=paragraph xml-lang=en-USemphInput Range/emph: The reference of the range of the data to analyze./paragraph + paragraph id=par_id2008201415533690271 role=paragraph xml-lang=en-USemphResults to/emph: The reference of the top left cell of the range where the results will be displayed./paragraph +/section +section id=grouped + paragraph id=hd_id2008201415533630182 role=heading xml-lang=en-US level=3Grouped By/paragraph + paragraph id=par_id2008201415533694478 role=paragraph xml-lang=en-USSelect whether the input data has emphcolumns/emph or emphrows/emph layout./paragraph +/section +section id=sampledata01 + paragraph id=hd_id2008201415533366360 role=heading xml-lang=en-US level=3Example/paragraph + paragraph id=par_id2008201415533343874 role=paragraph xml-lang=en-USThe following data will be used as example /paragraph + table id=Tabela3 +tablerow + tablecell colspan= rowspan= +/tablecell + tablecell colspan= rowspan= +paragraph id=par_id2008201415533312589 role=tablehead xml-lang=en-USA/paragraph + /tablecell + tablecell colspan= rowspan= +paragraph id=par_id200820141558155 role=tablehead xml-lang=en-USB/paragraph + /tablecell + tablecell colspan= rowspan= +paragraph id=par_id2008201415533321020 role=tablehead xml-lang=en-USC/paragraph + /tablecell +/tablerow +tablerow + tablecell colspan= rowspan= +paragraph id=par_id2008201415533376551 role=tablehead xml-lang=en-US1/paragraph + /tablecell + tablecell colspan= rowspan= +paragraph id=par_id200820141553335121 role=tablehead xml-lang=en-USMaths/paragraph + /tablecell + tablecell colspan= rowspan= +paragraph id=par_id2008201415533379519 role=tablehead xml-lang=en-USPhysics/paragraph + /tablecell + tablecell colspan= rowspan= +paragraph id=par_id20082014155644 role=tablehead xml-lang=en-USBiology/paragraph + /tablecell +/tablerow +tablerow + tablecell colspan= rowspan= +paragraph id=par_id2008201415533318687 role=tablehead xml-lang=en-US2/paragraph + /tablecell + tablecell colspan= rowspan= +paragraph
[Libreoffice-commits] core.git: helpcontent2
helpcontent2 |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c18a01a9fb0a4c973dd6d2147249f593050fb70e Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Wed Aug 20 21:36:38 2014 -0300 Updated core Project: help ba90edc72a3eedc95f2a2bd2c6923b860cc3e4d8 Fix fdo#80338 Help pages for Data Statistics This is a text to get a mimnimum help for Calc Data Statistics. It can be improved with better english and better maths. Change-Id: I3771ed89c560df1e4e23835f5a15d8cfc47282cd Reviewed-on: https://gerrit.libreoffice.org/11051 Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/helpcontent2 b/helpcontent2 index 356a862..ba90edc 16 --- a/helpcontent2 +++ b/helpcontent2 @@ -1 +1 @@ -Subproject commit 356a862f1cac3c528c53be0bc31ed4063444681c +Subproject commit ba90edc72a3eedc95f2a2bd2c6923b860cc3e4d8 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/qa
sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx |4 1 file changed, 4 deletions(-) New commits: commit e85bf96baac4691a4c1ea139cfb0e3551b9d6c1e Author: Miklos Vajna vmik...@collabora.co.uk Date: Fri Aug 22 18:06:28 2014 +0200 CppunitTest_sw_ooxmlfieldexport: enable on Windows Change-Id: I768bce2398098195f4e5c7d7683f2c8b22f23cc0 diff --git a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx index 9a8951d..3eec094 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlfieldexport.cxx @@ -9,8 +9,6 @@ #include swmodeltestbase.hxx -#if !defined(WNT) - #include com/sun/star/awt/XBitmap.hpp #include com/sun/star/graphic/XGraphic.hpp #include com/sun/star/frame/XStorable.hpp @@ -637,8 +635,6 @@ DECLARE_OOXMLEXPORT_TEST(testSdtCompanyMultipara, sdt-company-multipara.docx) } } -#endif - CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3-1' - sc/source
sc/source/core/tool/token.cxx |3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) New commits: commit 756e729f0e8c37143971e83b0e89d9b6ca9d1289 Author: Eike Rathke er...@redhat.com Date: Fri Aug 22 12:59:47 2014 +0200 resolved fdo#82936 do not clear the 3D flag on refupdate Change-Id: I2ae1368a2ffc20e988ff3ab66590a9f98902b862 (cherry picked from commit 75aad687cb5e63a41303aea568bf68b2b5f15d31) Reviewed-on: https://gerrit.libreoffice.org/11067 Reviewed-by: Kohei Yoshida libreoff...@kohei.us Reviewed-by: David Tardon dtar...@redhat.com Reviewed-by: Caolán McNamara caol...@redhat.com Tested-by: Caolán McNamara caol...@redhat.com diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx index a036c5b..ab7ebe4 100644 --- a/sc/source/core/tool/token.cxx +++ b/sc/source/core/tool/token.cxx @@ -2857,7 +2857,8 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMove( } rRef.SetAddress(aAbs, rNewPos); -rRef.SetFlag3D(b3DFlag); +if (b3DFlag) +rRef.SetFlag3D(b3DFlag); } break; case svDoubleRef: ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'feature/chart_opengl_window' - chart2/source
chart2/source/view/charttypes/GL3DBarChart.cxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 35c947ce0a63e71aa438ebb0bd107923995d7b2e Author: Zolnai Tamás tamas.zol...@collabora.com Date: Fri Aug 22 18:31:31 2014 +0200 Call resetCurrent as soon as possible to avoid conflict with other thread Change-Id: Ie3edc252135301ba5b85b80edcdbe75537d0da16 diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index af6f20c..cabfe41 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -113,7 +113,7 @@ void RenderThread::renderFrame() mpChart-mpRenderer-ProcessUnrenderedShape(mpChart-mbNeedsNewRender); mpChart-mbNeedsNewRender = false; mpChart-mpWindow-getContext().swapBuffers(); - +mpChart-mpWindow-getContext().resetCurrent(); } class RenderOneFrameThread : public RenderThread ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sw/source
sw/source/core/unocore/unocrsrhelper.cxx | 12
1 file changed, 8 insertions(+), 4 deletions(-)
New commits:
commit 130fc2f9951e0bb9eb1d17f99f277483d401b01c
Author: Stephan Bergmann sberg...@redhat.com
Date: Fri Aug 22 18:38:15 2014 +0200
Avoid undef member function call with this == nullptr
(in which case SwFrm::FindPageFrm, sw/source/core/layout/findfrm.cxx,
happened
to return nullptr, so all used to go well; but still...)
Change-Id: Ib513d9a157d0135ca234930bbcbeeacf814bb80e
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx
b/sw/source/core/unocore/unocrsrhelper.cxx
index 6b511ae..75203aa 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -898,11 +898,15 @@ void GetCurPageStyle(SwPaM rPaM, OUString rString)
{
if (!rPaM.GetCntntNode())
return; // TODO: is there an easy way to get it for tables/sections?
-const SwPageFrm* pPage =
rPaM.GetCntntNode()-getLayoutFrm(rPaM.GetDoc()-getIDocumentLayoutAccess().GetCurrentLayout())-FindPageFrm();
-if(pPage)
+SwCntntFrm* pFrame =
rPaM.GetCntntNode()-getLayoutFrm(rPaM.GetDoc()-getIDocumentLayoutAccess().GetCurrentLayout());
+if(pFrame)
{
-SwStyleNameMapper::FillProgName(pPage-GetPageDesc()-GetName(),
-rString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, true);
+const SwPageFrm* pPage = pFrame-FindPageFrm();
+if(pPage)
+{
+SwStyleNameMapper::FillProgName(pPage-GetPageDesc()-GetName(),
+rString, nsSwGetPoolIdFromName::GET_POOLID_PAGEDESC, 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-2' - sc/inc sc/source
sc/inc/types.hxx |8
sc/source/core/data/bcaslot.cxx | 36 ++--
sc/source/core/data/documen7.cxx |2 -
sc/source/core/data/table3.cxx | 67 +--
sc/source/core/inc/bcaslot.hxx |6 ++-
sc/source/core/tool/token.cxx|2 +
6 files changed, 111 insertions(+), 10 deletions(-)
New commits:
commit 2d8d35f9f74102b800a3b777a5e3d79dce283ae9
Author: Eike Rathke er...@redhat.com
Date: Thu Aug 14 23:36:47 2014 +0200
correct references after sort, fdo#79441
5c6ee09126631342939ae8766fe36083d8c011e3 introduced a different
algorithm for reference handling during sort. Unfortunately that clashed
with the SC_CLONECELL_ADJUST3DREL introduced a little earlier resulting
in relative 3D references effectively being adjusted twice.
Furthermore, in-sort-range range references to one row (or column) were
not adapted to the move at all if the formula within the range listened
only to ranges and not a single cell. Added collecting and adjusting
area listeners for this.
Last but not least, external (relative) references need to be treated
the same as internal 3D references, making them point to the same
location after the sort.
(cherry picked from commit 69adec3ec051ff94f600ab899506ca9d645a8b56)
Conflicts:
sc/inc/types.hxx
sc/source/core/data/bcaslot.cxx
Plus necessary parts of 27182231acd3a0c9898a8dba78b76dc8a827b4c0 related
to bcaslot changes.
Change-Id: I492768b525f95f1c43d1c6e7a63a36cce093fa5a
Reviewed-on: https://gerrit.libreoffice.org/10930
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index 732ff19..5226463 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -100,6 +100,14 @@ struct RangeMatrix
typedef boost::unordered_mapSCCOLROW,SCCOLROW ColRowReorderMapType;
+enum AreaOverlapType
+{
+AreaInside,
+AreaPartialOverlap,
+OneRowInsideArea,
+OneColumnInsideArea
+};
+
}
#endif
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 2dfc9a7..1eff597 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -446,7 +446,8 @@ void ScBroadcastAreaSlot::EraseArea(
ScBroadcastAreas::iterator rIter )
}
}
-void ScBroadcastAreaSlot::GetAllListeners( const ScRange rRange,
std::vectorsc::AreaListener rListeners )
+void ScBroadcastAreaSlot::GetAllListeners(
+const ScRange rRange, std::vectorsc::AreaListener rListeners,
sc::AreaOverlapType eType )
{
for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()),
aIterEnd( aBroadcastAreaTbl.end()); aIter != aIterEnd; ++aIter )
@@ -456,8 +457,32 @@ void ScBroadcastAreaSlot::GetAllListeners( const ScRange
rRange, std::vectorsc
ScBroadcastArea* pArea = (*aIter).mpArea;
const ScRange rAreaRange = pArea-GetRange();
-if (!rRange.In(rAreaRange))
-continue;
+
+switch (eType)
+{
+case sc::AreaInside:
+if (!rRange.In(rAreaRange))
+// The range needs to be fully inside specified range.
+continue;
+break;
+case sc::AreaPartialOverlap:
+if (!rRange.Intersects(rAreaRange) || rRange.In(rAreaRange))
+// The range needs to be only partially overlapping.
+continue;
+break;
+case sc::OneRowInsideArea:
+if (rAreaRange.aStart.Row() != rAreaRange.aEnd.Row() ||
!rRange.In(rAreaRange))
+// The range needs to be one single row and fully inside
+// specified range.
+continue;
+break;
+case sc::OneColumnInsideArea:
+if (rAreaRange.aStart.Col() != rAreaRange.aEnd.Col() ||
!rRange.In(rAreaRange))
+// The range needs to be one single column and fully inside
+// specified range.
+continue;
+break;
+}
SvtBroadcaster::ListenersType rLst =
pArea-GetBroadcaster().GetAllListeners();
SvtBroadcaster::ListenersType::iterator itLst = rLst.begin(), itLstEnd
= rLst.end();
@@ -1000,7 +1025,8 @@ void ScBroadcastAreaSlotMachine::FinallyEraseAreas(
ScBroadcastAreaSlot* pSlot )
maAreasToBeErased.swap( aCopy);
}
-std::vectorsc::AreaListener ScBroadcastAreaSlotMachine::GetAllListeners(
const ScRange rRange )
+std::vectorsc::AreaListener ScBroadcastAreaSlotMachine::GetAllListeners(
+const ScRange rRange, sc::AreaOverlapType eType )
{
std::vectorsc::AreaListener aRet;
@@ -1017,7 +1043,7 @@ std::vectorsc::AreaListener
ScBroadcastAreaSlotMachine::GetAllListeners( const
while ( nOff = nEnd )
{
[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - sc/inc sc/source
sc/inc/types.hxx |8
sc/source/core/data/bcaslot.cxx | 36 ++--
sc/source/core/data/documen7.cxx |2 -
sc/source/core/data/table3.cxx | 67 +--
sc/source/core/inc/bcaslot.hxx |6 ++-
sc/source/core/tool/token.cxx|2 +
6 files changed, 111 insertions(+), 10 deletions(-)
New commits:
commit b07951a867e66c8b8523505de9ad6c13e9b55fc7
Author: Eike Rathke er...@redhat.com
Date: Thu Aug 14 23:36:47 2014 +0200
correct references after sort, fdo#79441
5c6ee09126631342939ae8766fe36083d8c011e3 introduced a different
algorithm for reference handling during sort. Unfortunately that clashed
with the SC_CLONECELL_ADJUST3DREL introduced a little earlier resulting
in relative 3D references effectively being adjusted twice.
Furthermore, in-sort-range range references to one row (or column) were
not adapted to the move at all if the formula within the range listened
only to ranges and not a single cell. Added collecting and adjusting
area listeners for this.
Last but not least, external (relative) references need to be treated
the same as internal 3D references, making them point to the same
location after the sort.
(cherry picked from commit 69adec3ec051ff94f600ab899506ca9d645a8b56)
Conflicts:
sc/inc/types.hxx
sc/source/core/data/bcaslot.cxx
Plus necessary parts of 27182231acd3a0c9898a8dba78b76dc8a827b4c0 related
to bcaslot changes.
Change-Id: I492768b525f95f1c43d1c6e7a63a36cce093fa5a
Reviewed-on: https://gerrit.libreoffice.org/10929
Reviewed-by: Kohei Yoshida libreoff...@kohei.us
Tested-by: Kohei Yoshida libreoff...@kohei.us
diff --git a/sc/inc/types.hxx b/sc/inc/types.hxx
index 37784dc..d40b2a5 100644
--- a/sc/inc/types.hxx
+++ b/sc/inc/types.hxx
@@ -100,6 +100,14 @@ struct RangeMatrix
typedef boost::unordered_mapSCCOLROW,SCCOLROW ColRowReorderMapType;
+enum AreaOverlapType
+{
+AreaInside,
+AreaPartialOverlap,
+OneRowInsideArea,
+OneColumnInsideArea
+};
+
}
#endif
diff --git a/sc/source/core/data/bcaslot.cxx b/sc/source/core/data/bcaslot.cxx
index 2dfc9a7..1eff597 100644
--- a/sc/source/core/data/bcaslot.cxx
+++ b/sc/source/core/data/bcaslot.cxx
@@ -446,7 +446,8 @@ void ScBroadcastAreaSlot::EraseArea(
ScBroadcastAreas::iterator rIter )
}
}
-void ScBroadcastAreaSlot::GetAllListeners( const ScRange rRange,
std::vectorsc::AreaListener rListeners )
+void ScBroadcastAreaSlot::GetAllListeners(
+const ScRange rRange, std::vectorsc::AreaListener rListeners,
sc::AreaOverlapType eType )
{
for (ScBroadcastAreas::const_iterator aIter( aBroadcastAreaTbl.begin()),
aIterEnd( aBroadcastAreaTbl.end()); aIter != aIterEnd; ++aIter )
@@ -456,8 +457,32 @@ void ScBroadcastAreaSlot::GetAllListeners( const ScRange
rRange, std::vectorsc
ScBroadcastArea* pArea = (*aIter).mpArea;
const ScRange rAreaRange = pArea-GetRange();
-if (!rRange.In(rAreaRange))
-continue;
+
+switch (eType)
+{
+case sc::AreaInside:
+if (!rRange.In(rAreaRange))
+// The range needs to be fully inside specified range.
+continue;
+break;
+case sc::AreaPartialOverlap:
+if (!rRange.Intersects(rAreaRange) || rRange.In(rAreaRange))
+// The range needs to be only partially overlapping.
+continue;
+break;
+case sc::OneRowInsideArea:
+if (rAreaRange.aStart.Row() != rAreaRange.aEnd.Row() ||
!rRange.In(rAreaRange))
+// The range needs to be one single row and fully inside
+// specified range.
+continue;
+break;
+case sc::OneColumnInsideArea:
+if (rAreaRange.aStart.Col() != rAreaRange.aEnd.Col() ||
!rRange.In(rAreaRange))
+// The range needs to be one single column and fully inside
+// specified range.
+continue;
+break;
+}
SvtBroadcaster::ListenersType rLst =
pArea-GetBroadcaster().GetAllListeners();
SvtBroadcaster::ListenersType::iterator itLst = rLst.begin(), itLstEnd
= rLst.end();
@@ -1000,7 +1025,8 @@ void ScBroadcastAreaSlotMachine::FinallyEraseAreas(
ScBroadcastAreaSlot* pSlot )
maAreasToBeErased.swap( aCopy);
}
-std::vectorsc::AreaListener ScBroadcastAreaSlotMachine::GetAllListeners(
const ScRange rRange )
+std::vectorsc::AreaListener ScBroadcastAreaSlotMachine::GetAllListeners(
+const ScRange rRange, sc::AreaOverlapType eType )
{
std::vectorsc::AreaListener aRet;
@@ -1017,7 +1043,7 @@ std::vectorsc::AreaListener
ScBroadcastAreaSlotMachine::GetAllListeners( const
while ( nOff = nEnd )
{
[Libreoffice-commits] core.git: 3 commits - formula/source include/sal
formula/source/core/api/FormulaCompiler.cxx |2 +-
formula/source/core/api/token.cxx |2 +-
formula/source/ui/dlg/formula.cxx | 15 ++-
include/sal/log-areas.dox |1 +
4 files changed, 13 insertions(+), 7 deletions(-)
New commits:
commit 234fba5b451394cba39adc623f8e303845790605
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 22 19:49:58 2014 +0200
convert OSL_FAIL to SAL_WARN
Change-Id: I001f29dca5f2a01d70115bb309c99c64c4a65efb
diff --git a/formula/source/core/api/FormulaCompiler.cxx
b/formula/source/core/api/FormulaCompiler.cxx
index 5f63fcf..6c4f617 100644
--- a/formula/source/core/api/FormulaCompiler.cxx
+++ b/formula/source/core/api/FormulaCompiler.cxx
@@ -1885,7 +1885,7 @@ FormulaToken* FormulaCompiler::CreateStringFromToken(
OUStringBuffer rBuffer, F
case svSep:
break; // Opcodes
default:
-OSL_FAIL(FormulaCompiler:: GetStringFromToken
errUnknownVariable);
+SAL_WARN(formula.core, FormulaCompiler::GetStringFromToken:
unknown token type t-GetType());
} // of switch
}
}
diff --git a/formula/source/core/api/token.cxx
b/formula/source/core/api/token.cxx
index 227cd3d..95a3f24 100644
--- a/formula/source/core/api/token.cxx
+++ b/formula/source/core/api/token.cxx
@@ -922,7 +922,7 @@ bool FormulaTokenArray::HasMatrixDoubleRefOps()
sp = sal::static_int_castshort( sp - nParams );
if ( sp 0 )
{
-OSL_FAIL( FormulaTokenArray::HasMatrixDoubleRefOps: sp
0 );
+SAL_WARN(formula.core,
FormulaTokenArray::HasMatrixDoubleRefOps: sp 0 );
sp = 0;
}
pStack[sp++] = pResult;
commit 935147ce9c5a5aa3672b025ca9f51424c1a0740c
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 22 19:44:32 2014 +0200
convert OSL_... to SAL_WARN
Change-Id: I073b6f985c4a67f56319e03790b2bceee2f957ff
diff --git a/formula/source/ui/dlg/formula.cxx
b/formula/source/ui/dlg/formula.cxx
index 3377565..5b62011 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -565,9 +565,10 @@ sal_Int32 FormulaDlg_Impl::GetFunctionPos(sal_Int32 nPos)
nOldTokPos = nTokPos;
} // while ( pIter != pEnd )
}
-catch( const uno::Exception )
+catch ( const uno::Exception e )
{
-OSL_FAIL(Exception caught!);
+(void)e;
+SAL_WARN(formula.ui, FormulaDlg_Impl::GetFunctionPos exception!
e.Message);
}
return nFuncPos;
@@ -955,9 +956,10 @@ OUString FormulaDlg_Impl::RepairFormula(const OUString
aFormula)
}
}
-catch(const uno::Exception )
+catch ( const uno::Exception e )
{
-OSL_FAIL(Exception caught!);
+(void)e;
+SAL_WARN(formula.ui, FormulaDlg_Impl::RepairFormula exception!
e.Message);
}
return aResult;
}
@@ -1831,7 +1833,10 @@ void FormulaDlg::StoreFormEditData(FormEditData* pData)
const IFunctionDescription* FormulaDlg::getCurrentFunctionDescription() const
{
-OSL_VERIFY(!m_pImpl-pFuncDesc ||
m_pImpl-pFuncDesc-getSuppressedArgumentCount() == m_pImpl-nArgs);
+SAL_WARN_IF( (m_pImpl-pFuncDesc
m_pImpl-pFuncDesc-getSuppressedArgumentCount() != m_pImpl-nArgs),
+formula.ui, FormulaDlg::getCurrentFunctionDescription:
getSuppressedArgumentCount
+m_pImpl-pFuncDesc-getSuppressedArgumentCount() != nArgs
m_pImpl-nArgs for
+m_pImpl-pFuncDesc-getFunctionName());
return m_pImpl-pFuncDesc;
}
commit ce5980fe17d057148c1d4a065a0364076ca3542d
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 22 19:08:47 2014 +0200
add formula.ui
Change-Id: I0e2b38ab8e7fae483539e02e93d25d2532bd70ef
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index e09e2c5..b5bac8a 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -194,6 +194,7 @@ certain functionality.
@section formula
@li @c formula.core
+@li @c formula.ui
@section fpicker
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: Performance samples for LibreOffice ...
Hi Matus,
Any chance you can fix / commit this one ? :-)
Jan - wow - that is a nice error =) are there any other ODR issues ?
they habitually bite us hard so ... great to get libmerged debugged even
more. CC'ing the list too.
Another one I noticed :)
/aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:41:15:
warning: type �struct ODbaseIndex� violates one definition rule [-Wodr]
class ODbaseIndex : public ODbaseIndex_BASE
^
/aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:41:15: note:
a different type is defined in another translation unit
class ODbaseIndex : public ODbaseIndex_BASE
^
/aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:74:29: note:
the first difference of corresponding definitions is field �m_aHeader�
NDXHeader m_aHeader;
^
/aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:74:29: note:
a field of same name but different type is defined in another translation unit
NDXHeader m_aHeader;
^
/aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:55:20: note:
type �struct NDXHeader� should match type �struct NDXHeader�
struct NDXHeader
^
/aux/hubicka/libreoffice/connectivity/source/inc/dbase/DIndex.hxx:55:20: note:
the incompatible type is defined here
struct NDXHeader
Thisone will be harder to track - I can get better diagnostic with ODR merging
patch once I get around updating it for mainline
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/OpenOffice_dat.c:28:5:
warning: type of �OpenOffice_sent_brk� does not match original declaration
OpenOffice_sent_brk[];
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/sent_brk.c:10:3:
note: previously declared here
} OpenOffice_sent_brk={ 0.0, {
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/OpenOffice_dat.c:27:5:
warning: type of �OpenOffice_line_brk� does not match original declaration
OpenOffice_line_brk[],
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/line_brk.c:10:3:
note: previously declared here
} OpenOffice_line_brk={ 0.0, {
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/OpenOffice_dat.c:26:5:
warning: type of �OpenOffice_edit_word_hu_brk� does not match original
declaration
OpenOffice_edit_word_hu_brk[],
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/edit_word_hu_brk.c:10:3:
note: previously declared here
} OpenOffice_edit_word_hu_brk={ 0.0, {
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/OpenOffice_dat.c:25:5:
warning: type of �OpenOffice_edit_word_he_brk� does not match original
declaration
OpenOffice_edit_word_he_brk[],
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/edit_word_he_brk.c:10:3:
note: previously declared here
} OpenOffice_edit_word_he_brk={ 0.0, {
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/OpenOffice_dat.c:24:5:
warning: type of �OpenOffice_edit_word_brk� does not match original declaration
OpenOffice_edit_word_brk[],
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/edit_word_brk.c:10:3:
note: previously declared here
} OpenOffice_edit_word_brk={ 0.0, {
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/OpenOffice_dat.c:23:5:
warning: type of �OpenOffice_dict_word_prepostdash_brk� does not match
original declaration
OpenOffice_dict_word_prepostdash_brk[],
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/dict_word_prepostdash_brk.c:10:3:
note: previously declared here
} OpenOffice_dict_word_prepostdash_brk={ 0.0, {
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/OpenOffice_dat.c:22:5:
warning: type of �OpenOffice_dict_word_nodash_brk� does not match original
declaration
OpenOffice_dict_word_nodash_brk[],
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/dict_word_nodash_brk.c:10:3:
note: previously declared here
} OpenOffice_dict_word_nodash_brk={ 0.0, {
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/dict_word_hu_brk.c:10:3:
note: previously declared here
} OpenOffice_dict_word_hu_brk={ 0.0, {
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/OpenOffice_dat.c:20:5:
warning: type of �OpenOffice_dict_word_he_brk� does not match original
declaration
OpenOffice_dict_word_he_brk[],
^
/aux/hubicka/libreoffice/50-lto/workdir/CustomTarget/i18npool/breakiterator/dict_word_he_brk.c:10:3:
note: previously declared here
} OpenOffice_dict_word_he_brk={
[Libreoffice-commits] core.git: bridges/source
bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx | 10 +-
bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx |8
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit af73a28e8538f5b2df6bbfd592d8987511520d4d
Author: Caolán McNamara caol...@redhat.com
Date: Fri Aug 22 21:08:47 2014 +0100
if _CALL_ELF - if defined(_CALL_ELF) _CALL_ELF == 2
Change-Id: I34e9a98586b795a3fa31ae775aee7898b36e65d4
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
index 35cc16f..430999f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/cpp2uno.cxx
@@ -326,7 +326,7 @@ static typelib_TypeClass cpp2uno_call(
}
}
-#if _CALL_ELF == 2
+#if defined(_CALL_ELF) _CALL_ELF == 2
# define PARAMSAVE 32
#else
# define PARAMSAVE 48
@@ -545,7 +545,7 @@ extern C void privateSnippetExecutor( ... )
mr %0,1\n\t
: =r (sp) : );
-#if _CALL_ELF == 2
+#if defined(_CALL_ELF) _CALL_ELF == 2
volatile long nRegReturn[2];
#else
volatile long nRegReturn[1];
@@ -592,7 +592,7 @@ extern C void privateSnippetExecutor( ... )
default:
__asm__( ld 3,%0\n\t
: : m (nRegReturn[0]) );
-#if _CALL_ELF == 2
+#if defined(_CALL_ELF) _CALL_ELF == 2
__asm__( ld 4,%0\n\t
: : m (nRegReturn[1]) );
#endif
@@ -600,7 +600,7 @@ extern C void privateSnippetExecutor( ... )
}
}
-#if _CALL_ELF == 2
+#if defined(_CALL_ELF) _CALL_ELF == 2
const int codeSnippetSize = 32;
#else
const int codeSnippetSize = 24;
@@ -618,7 +618,7 @@ unsigned char * codeSnippet( unsigned char * code,
sal_Int32 nFunctionIndex, sa
if ( bHasHiddenParam )
nOffsetAndIndex |= 0x8000;
-#if _CALL_ELF == 2
+#if defined(_CALL_ELF) _CALL_ELF == 2
unsigned int *raw = (unsigned int *)code[0];
raw[0] = 0xe96c0018;/* 0: ld 11,2f-0b(12)*/
diff --git a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
index 391ef219..cfe720d 100644
--- a/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_powerpc64/uno2cpp.cxx
@@ -39,7 +39,7 @@ using namespace ::com::sun::star::uno;
namespace ppc64
{
-#if _CALL_ELF == 2
+#if defined(_CALL_ELF) _CALL_ELF == 2
bool is_complex_struct(const typelib_TypeDescription * type)
{
const typelib_CompoundTypeDescription * p
@@ -70,7 +70,7 @@ namespace ppc64
{
if (bridges::cpp_uno::shared::isSimpleType(pTypeRef))
return false;
-#if _CALL_ELF == 2
+#if defined(_CALL_ELF) _CALL_ELF == 2
else if (pTypeRef-eTypeClass == typelib_TypeClass_STRUCT ||
pTypeRef-eTypeClass == typelib_TypeClass_EXCEPTION)
{
typelib_TypeDescription * pTypeDescr = 0;
@@ -115,7 +115,7 @@ void MapReturn(long r3, long r4, double dret,
typelib_TypeDescriptionReference*
case typelib_TypeClass_DOUBLE:
*reinterpret_castdouble *( pRegisterReturn ) = dret;
break;
-#if _CALL_ELF == 2
+#if defined(_CALL_ELF) _CALL_ELF == 2
case typelib_TypeClass_STRUCT:
case typelib_TypeClass_EXCEPTION:
if (!ppc64::return_in_hidden_param(pReturnType))
@@ -175,7 +175,7 @@ static void callVirtualMethod(void * pThis, sal_uInt32
nVtableIndex,
pMethod += 8 * nVtableIndex;
pMethod = *((sal_uInt64 *)pMethod);
-#if _CALL_ELF == 2
+#if defined(_CALL_ELF) _CALL_ELF == 2
typedef void (* FunctionCall )(...);
#else
typedef void (* FunctionCall )( sal_uInt64, sal_uInt64, sal_uInt64,
sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64, sal_uInt64 );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: sc/source
sc/source/ui/vba/vbaaxes.cxx |8
sc/source/ui/vba/vbaformatconditions.cxx |6 +-
sc/source/ui/vba/vbaoleobjects.cxx |4
sc/source/ui/vba/vbastyles.cxx |7 +--
4 files changed, 22 insertions(+), 3 deletions(-)
New commits:
commit 7afacb97a7f8a6f98daba0f5c8dfcd4035218ce4
Author: Matúš Kukan matus.ku...@collabora.com
Date: Fri Aug 22 23:02:09 2014 +0200
Use anonymous namespace for these. (mostly EnumWrapper)
Change-Id: Ice90e519bbd32a12de59d696a6dfedaaf45bd45e
diff --git a/sc/source/ui/vba/vbaaxes.cxx b/sc/source/ui/vba/vbaaxes.cxx
index ca76ea4..46d9672 100644
--- a/sc/source/ui/vba/vbaaxes.cxx
+++ b/sc/source/ui/vba/vbaaxes.cxx
@@ -39,6 +39,8 @@ typedef ::std::vector AxesCoordinate vecAxesIndices;
typedef ::cppu::WeakImplHelper1 container::XIndexAccess
AxisIndexWrapper_BASE;
+namespace {
+
class EnumWrapper : public EnumerationHelper_BASE
{
uno::Referencecontainer::XIndexAccess m_xIndexAccess;
@@ -58,6 +60,8 @@ public:
}
};
+}
+
uno::Reference excel::XAxis
ScVbaAxes::createAxis( const uno::Reference excel::XChart xChart, const
uno::Reference uno::XComponentContext xContext, sal_Int32 nType, sal_Int32
nAxisGroup ) throw ( uno::RuntimeException, script::BasicErrorException )
{
@@ -78,6 +82,8 @@ ScVbaAxes::createAxis( const uno::Reference excel::XChart
xChart, const uno:
return new ScVbaAxis( xParent, xContext, xAxisPropertySet, nType,
nAxisGroup);
}
+namespace {
+
class AxisIndexWrapper : public AxisIndexWrapper_BASE
{
// if necessary for better performance we could change this into a map and
cache the
@@ -133,6 +139,8 @@ uno::Reference container::XIndexAccess
createIndexWrapper( const uno::Referen
return new AxisIndexWrapper( xContext, xChart );
}
+}
+
// #FIXME The collection semantics will never work as this object is not yet
initialised correctly
ScVbaAxes::ScVbaAxes( const uno::Reference XHelperInterface xParent,const
uno::Reference uno::XComponentContext xContext, const uno::Reference
excel::XChart xChart ) : ScVbaAxes_BASE( xParent, xContext,
createIndexWrapper( xChart, xContext )), moChartParent( xChart )
{
diff --git a/sc/source/ui/vba/vbaformatconditions.cxx
b/sc/source/ui/vba/vbaformatconditions.cxx
index 10fbede..21e8158 100644
--- a/sc/source/ui/vba/vbaformatconditions.cxx
+++ b/sc/source/ui/vba/vbaformatconditions.cxx
@@ -66,7 +66,7 @@ ScVbaFormatConditions::getElementType() throw
(css::uno::RuntimeException)
return cppu::UnoTypeexcel::XFormatCondition::get();
}
-uno::Any xSheetConditionToFormatCondition( const uno::Reference
XHelperInterface xRangeParent, const uno::Reference uno::XComponentContext
xContext, const uno::Reference excel::XStyles xStyles, const
uno::Reference excel::XFormatConditions xFormatConditions, const
uno::Reference beans::XPropertySet xRangeProps, const uno::Any aObject )
+static uno::Any xSheetConditionToFormatCondition( const uno::Reference
XHelperInterface xRangeParent, const uno::Reference uno::XComponentContext
xContext, const uno::Reference excel::XStyles xStyles, const
uno::Reference excel::XFormatConditions xFormatConditions, const
uno::Reference beans::XPropertySet xRangeProps, const uno::Any aObject )
{
uno::Reference sheet::XSheetConditionalEntry xSheetConditionalEntry;
aObject = xSheetConditionalEntry;
@@ -82,6 +82,8 @@ ScVbaFormatConditions::createCollectionObject(const uno::Any
aObject )
return xSheetConditionToFormatCondition( uno::Reference XHelperInterface
( mxRangeParent, uno::UNO_QUERY_THROW ), mxContext, mxStyles, this,
mxParentRangePropertySet, aObject );
}
+namespace {
+
class EnumWrapper : public EnumerationHelper_BASE
{
uno::Referencecontainer::XIndexAccess m_xIndexAccess;
@@ -107,6 +109,8 @@ public:
}
};
+}
+
uno::Reference excel::XFormatCondition SAL_CALL
ScVbaFormatConditions::Add( ::sal_Int32 _nType, const uno::Any _aOperator,
const uno::Any _aFormula1, const uno::Any _aFormula2 ) throw
(script::BasicErrorException, uno::RuntimeException, std::exception)
{
diff --git a/sc/source/ui/vba/vbaoleobjects.cxx
b/sc/source/ui/vba/vbaoleobjects.cxx
index cabfaa2..426dc12 100644
--- a/sc/source/ui/vba/vbaoleobjects.cxx
+++ b/sc/source/ui/vba/vbaoleobjects.cxx
@@ -30,6 +30,8 @@ using namespace ooo::vba;
typedef ::cppu::WeakImplHelper1 container::XIndexAccess XIndexAccess_BASE;
+namespace {
+
class IndexAccessWrapper : public XIndexAccess_BASE
{
typedef std::vector uno::Reference drawing::XControlShape OLEObjects;
@@ -102,6 +104,8 @@ uno::Reference container::XIndexAccess
oleObjectIndexWrapper( const uno::Refe
return new IndexAccessWrapper( xIndexAccess );
}
+}
+
ScVbaOLEObjects::ScVbaOLEObjects( const uno::Reference XHelperInterface
xParent, const uno::Reference uno::XComponentContext xContext,
const css::uno::Reference css::container::XIndexAccess
xIndexAccess )
Re: Discussion of Bug 37759 - Pixel around Objects like ellipse
Hi Thorsten,
Thorsten Behrens schrieb:
Regina Henschel wrote:
I think, the code that adds these points is
if( !bLineGeometryNeededOnly )
1906 {
1907 // hack aNewB2DPolyPolygon to fill logic rect - this is
1908 // needed to produce gradient fills that look like mso
1909 aNewB2DPolygon.clear();
1910 aNewB2DPolygon.append(basegfx::B2DPoint(0,0));
1911 aNewB2DPolygon.setClosed(true);
1912 aNewB2DPolyPolygon.append(aNewB2DPolygon);
1913
1914 aNewB2DPolygon.clear();
1915
aNewB2DPolygon.append(basegfx::B2DPoint(aLogicRect.GetWidth(),
1916 aLogicRect.GetHeight()));
1917 aNewB2DPolygon.setClosed(true);
1918 aNewB2DPolyPolygon.append(aNewB2DPolygon);
1919 }
in core/svx/source/customshapes/EnhancedCustomShape2d.cxx
Yep, and see the comment why this is there.
What is wrong with gradient fill and mso? Do you know an issue or do you
have test documents? I see no difference between AOO (without the
points) and LibreOffice (with this points).
Kind regards
Regina
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: avmedia/source basctl/source basic/source chart2/source editeng/source include/basic include/editeng include/sfx2 include/svl include/svtools include/tools sd/source sf
avmedia/source/macavf/macavfcommon.hxx | 1 - basctl/source/dlged/dlgedmod.cxx| 1 - basic/source/sbx/sbxarray.cxx | 1 + basic/source/sbx/sbxbase.cxx| 1 + basic/source/sbx/sbxobj.cxx | 1 + basic/source/sbx/sbxvalue.cxx | 1 + basic/source/sbx/sbxvar.cxx | 1 + chart2/source/tools/ObjectIdentifier.cxx| 1 - editeng/source/misc/txtrange.cxx| 1 + include/basic/sbxcore.hxx | 1 - include/editeng/editobj.hxx | 1 - include/sfx2/shell.hxx | 1 - include/svl/cenumitm.hxx| 1 - include/svl/macitem.hxx | 1 - include/svl/visitem.hxx | 1 - include/svtools/treelist.hxx| 1 - include/tools/debug.hxx | 1 - sd/source/core/TransitionPreset.cxx | 1 - sd/source/ui/dlg/TemplateScanner.cxx| 1 - sd/source/ui/dlg/filedlg.cxx| 1 - sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx | 1 - sfx2/source/doc/doctemplates.cxx| 1 - sfx2/source/inc/sfxtypes.hxx| 1 - slideshow/source/engine/slideview.cxx | 2 -- svl/source/config/cjkoptions.cxx| 2 +- svl/source/config/itemholder2.cxx | 2 -- svl/source/notify/SfxBroadcaster.cxx| 3 --- svl/source/notify/listener.cxx | 1 - svl/source/numbers/zforfind.cxx | 1 - svx/source/fmcomp/xmlexchg.cxx | 4 svx/source/form/ParseContext.cxx| 6 -- svx/source/form/formdispatchinterceptor.cxx | 5 - svx/source/gallery2/codec.cxx | 1 - svx/source/xml/xmlgrhlp.cxx | 1 - toolkit/source/awt/vclxspinbutton.cxx | 2 -- toolkit/source/controls/grid/sortablegriddatamodel.cxx | 1 - unotools/source/config/defaultoptions.cxx | 3 +-- unotools/source/config/fltrcfg.cxx | 1 + unotools/source/config/misccfg.cxx | 1 + unotools/source/config/saveopt.cxx | 1 + vcl/headless/svpgdi.cxx | 2 -- vcl/inc/quartz/common.h | 2 -- xmloff/source/chart/SchXMLChartContext.cxx | 1 - xmloff/source/chart/SchXMLExport.cxx| 1 - xmloff/source/chart/SchXMLImport.cxx| 1 - xmloff/source/chart/SchXMLPlotAreaContext.cxx | 1 - xmloff/source/chart/SchXMLSeries2Context.cxx| 1 - xmloff/source/chart/SchXMLSeriesHelper.cxx | 1 - xmloff/source/core/ProgressBarHelper.cxx| 1 - xmloff/source/core/xmlerror.cxx | 4 xmloff/source/core/xmlexp.cxx | 1 - xmloff/source/core/xmlictxt.cxx | 2 -- xmloff/source/core/xmlimp.cxx | 1 - xmloff/source/draw/sdxmlimp.cxx | 1 - xmloff/source/draw/xexptran.cxx | 1 - xmloff/source/meta/xmlversion.cxx | 1 - xmloff/source/style/impastpl.cxx| 1 +
[Libreoffice-commits] core.git: vcl/source
vcl/source/outdev/map.cxx |2 ++
1 file changed, 2 insertions(+)
New commits:
commit 4e31977bcdd79fc3ae23c4c470a782af6173f6c0
Author: Matúš Kukan matus.ku...@collabora.com
Date: Fri Aug 22 23:42:34 2014 +0200
WaE: unused parameter
Change-Id: Ie3e6e2f0a498f0871e8b757cd7ab73fa4eba0060
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index ee25091..396a2c4 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -1625,6 +1625,8 @@ Region OutputDevice::PixelToLogic( const Region
rDeviceRegion, const MapMode r
static void verifyUnitSourceDest( MapUnit eUnitSource, MapUnit eUnitDest )
{
+(void) eUnitSource;
+(void) eUnitDest;
DBG_ASSERT( eUnitSource != MAP_SYSFONT
eUnitSource != MAP_APPFONT
eUnitSource != MAP_RELATIVE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 3 commits - sc/source
sc/source/ui/view/viewfun6.cxx | 279 +
1 file changed, 171 insertions(+), 108 deletions(-)
New commits:
commit d40700d58e3a418fa54d8f1e424a1bccbd2f188e
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 22 23:40:58 2014 +0200
treat datetime as handled
Change-Id: Idc94174662eee5a75a6b467e47cbf9027e3ba224
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index b6856d0..b2494c1 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -379,6 +379,9 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const
OUString rUndoStr)
default:
assert(!unhandled current date/time request);
nReqFmt = NUMBERFORMAT_DATETIME;
+// fallthru
+case NUMBERFORMAT_DATETIME:
+break;
}
double fVal = 0.0;
switch (nReqFmt)
commit 0f4a999e02aff56043506e38dfa53ea3b349ce25
Author: Eike Rathke er...@redhat.com
Date: Fri Aug 22 23:25:23 2014 +0200
current date/time hotkey inserts also if cell is in input or edit mode
Change-Id: Ib3caed607a5ca1b5ce82de0472223c7bdc8f7f54
diff --git a/sc/source/ui/view/viewfun6.cxx b/sc/source/ui/view/viewfun6.cxx
index c688a54..b6856d0 100644
--- a/sc/source/ui/view/viewfun6.cxx
+++ b/sc/source/ui/view/viewfun6.cxx
@@ -24,6 +24,7 @@
#include vcl/msgbox.hxx
#include svl/zforlist.hxx
#include svl/zformat.hxx
+#include editeng/editview.hxx
#include viewfunc.hxx
#include detfunc.hxx
@@ -239,6 +240,9 @@ void ScViewFunc::DetectiveMarkSucc()
/** Insert date or time into current cell.
+If cell is in input or edit mode, insert date/time at cursor position, else
+create a date or time or date+time cell as follows:
+
- key date on time cell = current date + time of cell = date+time
formatted cell
- unless time cell was empty or 00:00 time = current date = date
formatted cell
- key date on date+time cell = current date + 00:00 time = date+time
formatted cell
@@ -255,138 +259,188 @@ void ScViewFunc::InsertCurrentTime(short nReqFmt, const
OUString rUndoStr)
ScViewData rViewData = GetViewData();
ScInputHandler* pInputHdl = SC_MOD()-GetInputHdl(
rViewData.GetViewShell());
-if (pInputHdl pInputHdl-IsInputMode())
-return; // don't fiddle with the cell while editing
+bool bInputMode = (pInputHdl pInputHdl-IsInputMode());
-ScAddress aCurPos = rViewData.GetCurPos();
ScDocShell* pDocSh = rViewData.GetDocShell();
ScDocument rDoc = pDocSh-GetDocument();
-::svl::IUndoManager* pUndoMgr = pDocSh-GetUndoManager();
-SvNumberFormatter* pFormatter = rDoc.GetFormatTable();
+ScAddress aCurPos = rViewData.GetCurPos();
const sal_uInt32 nCurNumFormat = rDoc.GetNumberFormat(aCurPos);
+SvNumberFormatter* pFormatter = rDoc.GetFormatTable();
const SvNumberformat* pCurNumFormatEntry =
pFormatter-GetEntry(nCurNumFormat);
-const short nCurNumFormatType = (pCurNumFormatEntry ?
-(pCurNumFormatEntry-GetType() ~NUMBERFORMAT_DEFINED) :
NUMBERFORMAT_UNDEFINED);
-bool bForceReqFmt = false;
-const double fCell = rDoc.GetValue( aCurPos);
-// Combine requested date/time stamp with existing cell time/date, if any.
-switch (nReqFmt)
+
+if (bInputMode)
{
-case NUMBERFORMAT_DATE:
-switch (nCurNumFormatType)
-{
-case NUMBERFORMAT_TIME:
-// An empty cell formatted as time (or 00:00 time) shall
-// not result in the current date with 00:00 time, but only
-// in current date.
-if (fCell != 0.0)
-nReqFmt = NUMBERFORMAT_DATETIME;
-break;
-case NUMBERFORMAT_DATETIME:
-{
-// Force to only date if the existing date+time is the
-// current date. This way inserting current date twice
-// on an existing date+time cell can be used to force
-// date, which otherwise would only be possible by
-// applying a date format.
-double fDate = rtl::math::approxFloor( fCell);
-if (fDate == (Date( Date::SYSTEM) -
*pFormatter-GetNullDate()))
-bForceReqFmt = true;
-}
-break;
-}
-break;
-case NUMBERFORMAT_TIME:
-switch (nCurNumFormatType)
-{
-case NUMBERFORMAT_DATE:
-// An empty cell formatted as date shall not result in the
-// null date and current time, but only in current time.
-if (fCell != 0.0)
-nReqFmt = NUMBERFORMAT_DATETIME;
-break;
-case
Re: Discussion of Bug 37759 - Pixel around Objects like ellipse
Regina Henschel wrote: What is wrong with gradient fill and mso? Do you know an issue or do you have test documents? I see no difference between AOO (without the points) and LibreOffice (with this points). This blog should give some more background info; no bugdocs at hand currently, but shouldn't be hard to come by - the sticking point are the subshapes, e.g. the eyes of the smiley: http://blog.thebehrens.net/2009/07/21/selected-interop-improvement-how-to-fill-ppt-autoshapes/ HTH, -- Thorsten signature.asc Description: Digital signature ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
Re: Performance samples for LibreOffice ...
Hi Matus, Any chance you can fix / commit this one ? :-) Jan - wow - that is a nice error =) are there any other ODR issues ? they habitually bite us hard so ... great to get libmerged debugged even more. CC'ing the list too. I have patch in way for type virtual tables ODR checking (the problem is that it requires us to stream mangled type names to establish ODR equivalency at link time. This adds extra 2% of streaming that I need to justify). Current mainline (I used for my test) reports ODR violation only for types with virtual tables. I will check if I notice more and will try to run it with full ODR checking enabled. I also want to add a way to dump the translation unit, because often these are caused by different #defines or by -funsigned-char/-fsigned-char differences. In those cases the erros output are quite puzzling ;) Honza Thanks ! Michael. On Fri, 2014-08-22 at 17:05 +0200, Jan Hubicka wrote: Hi, this is another warning that may be worth fixing /aux/hubicka/libreoffice/sc/source/ui/vba/vbastyles.cxx:68:7: warning: type �struct EnumWrapper� violates one definition rule [-Wodr] class EnumWrapper : public EnumerationHelper_BASE ^ /aux/hubicka/libreoffice/sc/source/ui/vba/vbaoleobjects.cxx:74:7: note: a different type is defined in another translation unit class EnumWrapper : public EnumerationHelper_BASE ^ /aux/hubicka/libreoffice/sc/source/ui/vba/vbastyles.cxx:70:50: note: the first difference of corresponding definitions is field �m_xIndexAccess� uno::Referencecontainer::XIndexAccess m_xIndexAccess; ^ /aux/hubicka/libreoffice/sc/source/ui/vba/vbaoleobjects.cxx:77:43: note: a field with different name is defined in another translation unit uno::ReferenceXHelperInterface m_xParent; -- michael.me...@collabora.com , Pseudo Engineer, itinerant idiot ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-commits] core.git: 3 commits - sc/source
sc/source/filter/excel/excdoc.cxx | 263 ++
sc/source/filter/inc/excdoc.hxx | 10 -
2 files changed, 164 insertions(+), 109 deletions(-)
New commits:
commit 10851dff98846c94ccc14ee58d993362c82734c9
Author: Kohei Yoshida kohei.yosh...@collabora.com
Date: Fri Aug 22 18:58:51 2014 -0400
Split FillAsTable into Binary and Xml variants in the same manner.
And remove BIFF-only records from the Xml variant.
Change-Id: Ia18cc079d9a9249fbbe0c328b14b719fba8d6bbf
diff --git a/sc/source/filter/excel/excdoc.cxx
b/sc/source/filter/excel/excdoc.cxx
index 5fff7c8..490d7d4 100644
--- a/sc/source/filter/excel/excdoc.cxx
+++ b/sc/source/filter/excel/excdoc.cxx
@@ -453,7 +453,7 @@ void ExcTable::FillAsHeaderXml( ExcBoundsheetList
rBoundsheetList )
aRecList.AppendRecord( CreateRecord( EXC_ID_SST ) );
}
-void ExcTable::FillAsTable( SCTAB nCodeNameIdx )
+void ExcTable::FillAsTableBinary( SCTAB nCodeNameIdx )
{
InitializeTable( mnScTab );
@@ -482,12 +482,6 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx )
mxNoteList-AppendNewRecord(new XclExpNote(GetRoot(), it-maPos,
it-mpNote, OUString()));
}
-if( GetOutput() != EXC_OUTPUT_BINARY )
-{
-FillAsXmlTable( nCodeNameIdx );
-return;
-}
-
// WSBOOL needs data from page settings, create it here, add it later
boost::shared_ptr XclExpPageSettings xPageSett( new XclExpPageSettings(
GetRoot() ) );
bool bFitToPages = xPageSett-GetPageData().mbFitToPages;
@@ -603,17 +597,37 @@ void ExcTable::FillAsTable( SCTAB nCodeNameIdx )
Add( new ExcEof );
}
-void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx )
+void ExcTable::FillAsTableXml()
{
-RootData rR = GetOldRoot();
+InitializeTable( mnScTab );
+
+ScDocument rDoc = GetDoc();
+
+OSL_ENSURE( (mnScTab = 0L) (mnScTab = MAXTAB), -ExcTable::Table():
mnScTab - no ordinary table! );
+OSL_ENSURE( nExcTab = static_castsal_uInt16(MAXTAB),
-ExcTable::Table(): nExcTab - no ordinary table! );
+
+// create a new OBJ list for this sheet (may be used by notes, autofilter,
data validation)
+GetObjectManager().StartSheet();
+
+// cell table: DEFROWHEIGHT, DEFCOLWIDTH, COLINFO, DIMENSIONS, ROW, cell
records
+mxCellTable.reset( new XclExpCellTable( GetRoot() ) );
+
+//export cell notes
+std::vectorsc::NoteEntry aNotes;
+rDoc.GetAllNoteEntries(aNotes);
+for (std::vectorsc::NoteEntry::const_iterator it = aNotes.begin(), itEnd
= aNotes.end(); it != itEnd; ++it)
+{
+if (it-maPos.Tab() != mnScTab)
+continue;
+
+mxNoteList-AppendNewRecord(new XclExpNote(GetRoot(), it-maPos,
it-mpNote, OUString()));
+}
// WSBOOL needs data from page settings, create it here, add it later
boost::shared_ptr XclExpPageSettings xPageSett( new XclExpPageSettings(
GetRoot() ) );
XclExtLstRef xExtLst( new XclExtLst( GetRoot() ) );
bool bFitToPages = xPageSett-GetPageData().mbFitToPages;
-Add( new ExcBof8 );
-
Color aTabColor = GetRoot().GetDoc().GetTabBgColor(mnScTab);
Add(new XclExpXmlSheetPr(bFitToPages, mnScTab, aTabColor,
GetFilterManager()));
@@ -630,18 +644,6 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx )
// cell table: DEFCOLWIDTH, COLINFO, DIMENSIONS, ROW, cell records
aRecList.AppendRecord( mxCellTable );
-// label ranges
-// missing SaveXML
-Add( new XclExpLabelranges( GetRoot() ) );
-
-// DFF not needed in MSOOXML export
-//GetObjectManager().AddSdrPage();
-////! close Escher group shape and ESCHER_DgContainer
-////! opened by XclExpObjList ctor MSODRAWING
-//rR.pObjRecs-EndSheet();
-//// all MSODRAWING and OBJ stuff of this sheet goes here
-//Add( rR.pObjRecs );
-
// pivot tables
// not in the worksheet file
aRecList.AppendRecord( GetPivotTableManager().CreatePivotTablesRecord(
mnScTab ) );
@@ -651,11 +653,6 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx )
if( mxNoteList != 0 !mxNoteList-IsEmpty() )
aRecList.AppendNewRecord( new XclExpComments( mnScTab, *mxNoteList ) );
-// web queries
-// missing SaveXML implementation
-Add( new XclExpWebQueryBuffer( GetRoot() ) );
-
-ScDocument rDoc = GetDoc();
const ScTableProtection* pTabProtect = rDoc.GetTabProtection(mnScTab);
if (pTabProtect pTabProtect-isProtected())
Add( new XclExpSheetProtection(true, mnScTab) );
@@ -668,10 +665,6 @@ void ExcTable::FillAsXmlTable( SCTAB nCodeNameIdx )
// conditional formats
Add( new XclExpCondFormatBuffer( GetRoot(), xExtLst ) );
-if( HasVbaStorage() )
-if( nCodeNameIdx GetExtDocOptions().GetCodeNameCount() )
-Add( new XclCodename( GetExtDocOptions().GetCodeName( nCodeNameIdx
) ) );
-
// data validation (DVAL and list of DV records), generated by the cell
table
aRecList.AppendRecord( mxCellTable-CreateRecord( EXC_ID_DVAL ) );
@@ -687,24
[Libreoffice-commits] core.git: sc/uiconfig
sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) New commits: commit 6814967742cf1baa103048675545e57052104602 Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Fri Aug 22 22:24:02 2014 -0300 Restore help button in Pivot Table Dialog Change-Id: I9602fbb7edd7c7370a806cc0a61b3743a13229de Reviewed-on: https://gerrit.libreoffice.org/11080 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui index 05d54cd..d72fa7f 100644 --- a/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui +++ b/sc/uiconfig/scalc/ui/pivottablelayoutdialog.ui @@ -29,7 +29,7 @@ packing property name=expandTrue/property property name=fillTrue/property -property name=position1/property +property name=position0/property /packing /child child @@ -43,6 +43,20 @@ packing property name=expandTrue/property property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=help +property name=labelgtk-help/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property +property name=use_stockTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property property name=position2/property /packing /child ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: 2 commits - sc/uiconfig
sc/uiconfig/scalc/ui/condformatmanager.ui | 208 ++--- sc/uiconfig/scalc/ui/conditionalformatdialog.ui | 279 ++-- 2 files changed, 291 insertions(+), 196 deletions(-) New commits: commit c8a3b2d14c4942aa7d0d325a7b925f93b985161c Author: Olivier Hallot olivier.hal...@edx.srv.br Date: Fri Aug 22 21:29:52 2014 -0300 HIG-ify Cond. format manager + Help button * Add help button to Conditional format manager * HIG-ify with frame Change-Id: I54a77a8e33a9bbbc1dd9b64cb4997a21c2e1a318 Reviewed-on: https://gerrit.libreoffice.org/11079 Reviewed-by: Thomas Arnhold tho...@arnhold.org Tested-by: Thomas Arnhold tho...@arnhold.org diff --git a/sc/uiconfig/scalc/ui/condformatmanager.ui b/sc/uiconfig/scalc/ui/condformatmanager.ui index 7a01298..fa8f347 100644 --- a/sc/uiconfig/scalc/ui/condformatmanager.ui +++ b/sc/uiconfig/scalc/ui/condformatmanager.ui @@ -15,6 +15,118 @@ property name=vexpandTrue/property property name=orientationvertical/property property name=spacing12/property +child + object class=GtkFrame id=frame1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=label_xalign0/property +property name=shadow_typenone/property +child + object class=GtkAlignment id=alignment1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=top_padding6/property +property name=bottom_padding6/property +property name=left_padding12/property +property name=right_padding12/property +child + object class=GtkBox id=box1 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=orientationvertical/property +property name=spacing6/property +child + object class=svtlo-SvSimpleTableContainer id=CONTAINER +property name=visibleTrue/property +property name=can_focusTrue/property +property name=hexpandTrue/property +property name=vexpandTrue/property +child internal-child=selection + object class=GtkTreeSelection id=Simple Table Container-selection/ +/child + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButtonBox id=buttonbox2 +property name=visibleTrue/property +property name=can_focusFalse/property +property name=spacing12/property +property name=layout_stylestart/property +child + object class=GtkButton id=add +property name=label translatable=yesAdd/property +property name=use_action_appearanceFalse/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position0/property + /packing +/child +child + object class=GtkButton id=edit +property name=label translatable=yesEdit.../property +property name=use_action_appearanceFalse/property +property name=visibleTrue/property +property name=can_focusTrue/property +property name=receives_defaultTrue/property + /object + packing +property name=expandFalse/property +property name=fillTrue/property +property name=position1/property + /packing +/child +child + object class=GtkButton id=remove +property name=label translatable=yesRemove/property +property
[Libreoffice-commits] core.git: cui/AllLangResTarget_cui.mk cui/source cui/uiconfig
cui/AllLangResTarget_cui.mk|1
cui/source/dialogs/cuihyperdlg.cxx | 56 +++--
cui/source/dialogs/iconcdlg.cxx| 23 +--
cui/source/dialogs/iconcdlg.src| 26 -
cui/source/inc/cuihyperdlg.hxx |2 +
cui/source/inc/cuires.hrc |3 -
cui/source/inc/iconcdlg.hxx|4 ++
cui/uiconfig/ui/hyperlinkdialog.ui | 34 +++---
8 files changed, 85 insertions(+), 64 deletions(-)
New commits:
commit f4246fab77113147b36706a1f3d93e8724ff826b
Author: Thomas Arnhold tho...@arnhold.org
Date: Sun Aug 17 13:34:20 2014 +0200
fdo#56456 fdo#75578 fdo#63271 fdo#75805 Improve hyperlink dialog
Changes made:
* Rename Back to Reset like in other dialogs (eg. Writer - Format -
Character).
* Apply-Button, which reflects the old behavior of the dialog, and doesn't
close it automatically.
* Added an OK-Button, which applies the changes made and automatically
closes the
dialog.
With this both use cases should be handled:
* Inserting one single URI with simple close.
* Modifying multiple URIs without closing the dialog.
Hopefully all users are happy with this ;)
Change-Id: I1881dee083945cd165fbb8f8444395c1b04a0607
Reviewed-on: https://gerrit.libreoffice.org/10946
Reviewed-by: Samuel Mehrbrodt s.mehrbr...@gmail.com
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/cui/AllLangResTarget_cui.mk b/cui/AllLangResTarget_cui.mk
index 2023160..5e8f673 100644
--- a/cui/AllLangResTarget_cui.mk
+++ b/cui/AllLangResTarget_cui.mk
@@ -30,7 +30,6 @@ $(eval $(call gb_SrsTarget_add_files,cui/res,\
cui/source/dialogs/fmsearch.src \
cui/source/dialogs/gallery.src \
cui/source/dialogs/hyperdlg.src \
-cui/source/dialogs/iconcdlg.src \
cui/source/dialogs/multipat.src \
cui/source/dialogs/passwdomdlg.src \
cui/source/dialogs/scriptdlg.src \
diff --git a/cui/source/dialogs/cuihyperdlg.cxx
b/cui/source/dialogs/cuihyperdlg.cxx
index 5bf73b9..ede512f 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -113,7 +113,6 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings*
pBindings)
pEntry-SetQuickHelpText( CUI_RESSTR( RID_SVXSTR_HYPERDLG_HLDOCNTP_HELP )
);
// set OK/Cancel - button
-GetOKButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_APPLYBUT) );
GetCancelButton().SetText ( CUI_RESSTR(RID_SVXSTR_HYPDLG_CLOSEBUT) );
// create itemset for tabpages
@@ -151,7 +150,8 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings*
pBindings)
pBindings-Update( SID_READONLY_MODE );
-GetOKButton().SetClickHdl( LINK ( this, SvxHpLinkDlg,
ClickApplyHdl_Impl ) );
+GetOKButton().SetClickHdl( LINK ( this, SvxHpLinkDlg, ClickOkHdl_Impl
) );
+GetApplyButton().SetClickHdl ( LINK ( this, SvxHpLinkDlg,
ClickApplyHdl_Impl ) );
GetCancelButton().SetClickHdl( LINK ( this, SvxHpLinkDlg,
ClickCloseHdl_Impl ) );
}
@@ -178,6 +178,29 @@ bool SvxHpLinkDlg::Close()
return true;
}
+void SvxHpLinkDlg::Apply()
+{
+SfxItemSet aItemSet( SfxGetpApp()-GetPool(), SID_HYPERLINK_GETLINK,
+ SID_HYPERLINK_SETLINK );
+
+SvxHyperlinkTabPageBase* pCurrentPage = (SvxHyperlinkTabPageBase*)
+GetTabPage ( GetCurPageId() );
+
+if ( pCurrentPage-AskApply() )
+{
+pCurrentPage-FillItemSet( aItemSet );
+
+SvxHyperlinkItem *aItem = (SvxHyperlinkItem *)
+ aItemSet.GetItem (SID_HYPERLINK_SETLINK);
+OUString aStrEmpty;
+if ( aItem-GetURL() != aStrEmpty )
+GetDispatcher()-Execute( SID_HYPERLINK_SETLINK,
SFX_CALLMODE_ASYNCHRON |
+ SFX_CALLMODE_RECORD, aItem, 0L);
+
+( (SvxHyperlinkTabPageBase*)GetTabPage ( GetCurPageId() ) )-DoApply();
+}
+}
+
/*
|*
|* When extrawindow is visible and its never moved by user, then move that
@@ -231,6 +254,15 @@ void SvxHpLinkDlg::Move()
Window::Move();
}
+/// Click on OK button
+IMPL_LINK_NOARG(SvxHpLinkDlg, ClickOkHdl_Impl)
+{
+Apply();
+Close();
+
+return ( 0L );
+}
+
/*
|*
|* Click on Apply-button
@@ -239,25 +271,7 @@ void SvxHpLinkDlg::Move()
IMPL_LINK_NOARG(SvxHpLinkDlg, ClickApplyHdl_Impl)
{
-SfxItemSet aItemSet( SfxGetpApp()-GetPool(), SID_HYPERLINK_GETLINK,
- SID_HYPERLINK_SETLINK );
-
-SvxHyperlinkTabPageBase* pCurrentPage = (SvxHyperlinkTabPageBase*)
-GetTabPage ( GetCurPageId() );
-
-if ( pCurrentPage-AskApply() )
-{
-pCurrentPage-FillItemSet( aItemSet );
-
-
[Libreoffice-commits] core.git: sw/source
sw/source/ui/table/tabledlg.cxx |1 + 1 file changed, 1 insertion(+) New commits: commit 9aede3befb65524d71a2cb8081ded6eb7aa67f55 Author: Thomas Arnhold tho...@arnhold.org Date: Sat Aug 23 06:08:36 2014 +0200 fdo#80534 bad default value (0) for the number of rows Change-Id: I39604cf13d1e5714f701dd663ab37a8aed924fa2 diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index 79eb155..4a35671 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1591,6 +1591,7 @@ void SwTextFlowPage::Reset( const SfxItemSet* rSet ) m_pHeadLineCB-Check( nRep 0 ); m_pHeadLineCB-SaveValue(); m_pRepeatHeaderNF-SetValue( nRep ); +m_pRepeatHeaderNF-SetMin( 1 ); m_pRepeatHeaderNF-SaveValue(); } if ( rSet-GetItemState(FN_TABLE_BOX_TEXTORIENTATION) SFX_ITEM_AVAILABLE ) ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: starmath/source
starmath/source/mathmlexport.cxx |1 +
1 file changed, 1 insertion(+)
New commits:
commit 3d34eb4612fa59fae7594399d3d6f798ddb35582
Author: Julien Nabet serval2...@yahoo.fr
Date: Wed Aug 20 23:02:56 2014 +0200
Resolves: fdo#82747 Crash on opening wikipedia ODT Book
Test if there's indeed a subnode before testing its type
Change-Id: I1bb32652ceb82b0818a8d2cd8d71b46dd96ef2aa
Reviewed-on: https://gerrit.libreoffice.org/11050
Reviewed-by: Thomas Arnhold tho...@arnhold.org
Tested-by: Thomas Arnhold tho...@arnhold.org
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 6308de3..c55190b 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -866,6 +866,7 @@ void SmXMLExport::ExportTable(const SmNode *pNode, int
nLevel)
}
else if (pTemp-GetType() == NLINE
pTemp-GetNumSubNodes() == 1
+ pTemp-GetSubNode(0)
pTemp-GetSubNode(0)-GetType() == NALIGN)
{
// For the Table() construction, the NALIGN node is a child
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
Re: minutes of ESC call ...
On Thu, 21 Aug 2014 17:18:42 +0200, Michael Meeks michael.me...@collabora.com wrote: + 4.2.7 - due in week 40 - 29th Sept freeze. + Potential for new incremental releases sooner. what does this mean? will we see a 4.2.8 release too? ___ LibreOffice mailing list LibreOffice@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice
[Libreoffice-bugs] [Bug 82928] Lookup formulae don't update when sheet is sorted
https://bugs.freedesktop.org/show_bug.cgi?id=82928 Mike B mjbr...@acm.org changed: What|Removed |Added Status|NEEDINFO|UNCONFIRMED Ever confirmed|1 |0 --- Comment #4 from Mike B mjbr...@acm.org --- Behavior did not change in 4.3.2 of Aug. 21 2014. Sort of data still does not trigger update of lookups and, it turns out, another related cell that just does some simple arithmetic. Workaround (to avoid save-exit-restart LO cycle) is to copy the related cells for the first line of data (which usually are OK) and copy them over the others. Copying the formulae does trigger the refresh. F9 manual refresh does nothing in this case, either. The VLOOKUP concern is probably a red herring. The real issue seems to be the failure to trigger a refresh of related cells when cell contents change due to a sort. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82928] Lookup formulae don't update when sheet is sorted
https://bugs.freedesktop.org/show_bug.cgi?id=82928 --- Comment #5 from Mike B mjbr...@acm.org --- Edit to the last comment: the workaround is to copy the cells related to the first line of data, the PASTE over the others down to at least the end of the data. The paste seems to trigger a refresh after which everything displays correctly again. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82934] New: Text disappears on scroll
https://bugs.freedesktop.org/show_bug.cgi?id=82934 Priority: medium Bug ID: 82934 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Text disappears on scroll Severity: major Classification: Unclassified OS: Linux (All) Reporter: lora...@yopmail.com Hardware: x86-64 (AMD64) Status: UNCONFIRMED Version: 4.2.6.2 release Component: Writer Product: LibreOffice Currently running Crunchbang Linux and using the default Libre Office Writer. Steps to reproduce: 1. Open libreoffice-writer 2. Start a new document 3. Write a couple of lines of text, e.g. - start - A B C - end - 4. Scroll down 5. Text disappears To make it appearing again, you have to click in the page's header. If zoom is greater or equal to 200% the bug does not exist. The bug was not exist on the same Linux OS and Libre Office 3.5. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82675] Drawing line added to chart in spreadsheet is lost
https://bugs.freedesktop.org/show_bug.cgi?id=82675 raal r...@post.cz changed: What|Removed |Added Status|UNCONFIRMED |NEEDINFO CC||r...@post.cz Ever confirmed|0 |1 --- Comment #2 from raal r...@post.cz --- Hello Tom, I'm unable to reproduce with Version: 4.4.0.0.alpha0+ Build ID: d718c1f65f850f7897b942c2e4415110132e51a5 TinderBox: Linux-rpm_deb-x86_64@46-TDF, Branch:master, Time: 2014-08-21_00:23:28 Unable to reproduce with Version: 4.3.2.0.0+ Build ID: 25459cb0c9afdf46c3d90ae8ba0b6ffb375f67da TinderBox: Linux-rpm_deb-x86_64@46-TDF, Branch:libreoffice-4-3, Time: 2014-08-17_22:48:01 9) Issue 2: The drawn line is gone Copy, paste to Writer (CTRL+C, CTRL+V) copied line also. 11) Issue 3: The drawn line is gone. After save and reopen, drawn line is in the file. Please, one issue per request. Don't know if issue 1 is a bug - what do you expect? Selected range? Please, could you test with newer version? Thank you. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82935] New: EDITING: Highlighting conflict with Word 2013
https://bugs.freedesktop.org/show_bug.cgi?id=82935 Priority: medium Bug ID: 82935 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: EDITING: Highlighting conflict with Word 2013 Severity: normal Classification: Unclassified OS: Windows (All) Reporter: timchamb...@environmentalstrategies.com.au Hardware: Other Whiteboard: BSA Status: UNCONFIRMED Version: 4.3.0.4 release Component: Writer Product: LibreOffice Created attachment 105076 -- https://bugs.freedesktop.org/attachment.cgi?id=105076action=edit sample file with highlighting created in Word - can't remove highlighting in Writer Hi. I have a file created in Word (2013) with text highlighted in yellow. If I open this file in writer, I cannot un-highlight the text using either the highlight or background colour options through menus or icons. I have attached a simple sample document which also had this problem. I've seen the problem discussed in reverse (LO documents with sticky highlighting in Word) but not this way around. Cheers Operating System: Windows 8 Version: 4.3.0.4 release -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82830] Inconsistent display of some characters, especially Unicode 21A6 : ↦
https://bugs.freedesktop.org/show_bug.cgi?id=82830 --- Comment #5 from Grasyop gras...@yahoo.fr --- Another symptom: when I write « %alpha » in Formula, it used to be converted in α. It isn’t anymore. The font used for formula variables is Liberation Serif, Italics. I verified I have this font in C:\Windows\Fonts I don’t understand the problem. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82936] New: Editing : references to different sheet get removed on dragging cell
https://bugs.freedesktop.org/show_bug.cgi?id=82936 Priority: medium Bug ID: 82936 Assignee: libreoffice-bugs@lists.freedesktop.org Summary: Editing : references to different sheet get removed on dragging cell Severity: normal Classification: Unclassified OS: All Reporter: ja...@rinac.com Hardware: Other Status: UNCONFIRMED Version: 4.3.1.1 rc Component: Spreadsheet Product: LibreOffice references to different sheet get removed on dragging cell. Reference changes to same sheet. Step to produce. 1. enter some value in the cells [sheet1] 2. create some formula using values entered in sheet1 3. create a reference in other sheet[sheet2] using formula referring sheet1 4. move the formula created in sheet1. 5. the formula eg. sheet1.A1 get lost on sheet 2 become A1 only Sample file attached. first formula cells on sheet2 move yellow cell on sheet 1 now check formula on sheet 2. all reference become lost. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82936] Editing : references to different sheet get removed on dragging cell
https://bugs.freedesktop.org/show_bug.cgi?id=82936 --- Comment #1 from Jaise James ja...@rinac.com --- Created attachment 105077 -- https://bugs.freedesktop.org/attachment.cgi?id=105077action=edit Reference lost on drag -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82936] Editing : references to different sheet get removed on dragging cell
https://bugs.freedesktop.org/show_bug.cgi?id=82936 --- Comment #2 from Jaise James ja...@rinac.com --- Created attachment 105078 -- https://bugs.freedesktop.org/attachment.cgi?id=105078action=edit drag1 -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82936] Editing : references to different sheet get removed on dragging cell
https://bugs.freedesktop.org/show_bug.cgi?id=82936 --- Comment #3 from Jaise James ja...@rinac.com --- Created attachment 105079 -- https://bugs.freedesktop.org/attachment.cgi?id=105079action=edit before drag -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82936] Editing : references to different sheet get removed on dragging cell
https://bugs.freedesktop.org/show_bug.cgi?id=82936 --- Comment #4 from Jaise James ja...@rinac.com --- Created attachment 105080 -- https://bugs.freedesktop.org/attachment.cgi?id=105080action=edit drag cell -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82936] Editing : references to different sheet get removed on dragging cell
https://bugs.freedesktop.org/show_bug.cgi?id=82936 --- Comment #5 from Jaise James ja...@rinac.com --- Created attachment 105081 -- https://bugs.freedesktop.org/attachment.cgi?id=105081action=edit after drag cell formula -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82723] VIEWING: If text is longer than 1 page in web view, changing zoom size crashes Libreoffice
https://bugs.freedesktop.org/show_bug.cgi?id=82723 --- Comment #6 from Robo Pluhar robo-plu...@email.cz --- Created attachment 105082 -- https://bugs.freedesktop.org/attachment.cgi?id=105082action=edit Large lorem ipsum ODT document (532.000 chars) Writer crashes after Web layout switch (zoomed 100%) -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 64490] LibO Writer text highligthing not compatible with MS Word DOC and DOCX (highlighting transforms to background color)
https://bugs.freedesktop.org/show_bug.cgi?id=64490 tommy27 ba...@quipo.it changed: What|Removed |Added CC||timchambers@environmentalst ||rategies.com.au --- Comment #43 from tommy27 ba...@quipo.it --- *** Bug 82935 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82935] EDITING: Highlighting conflict with Word 2013
https://bugs.freedesktop.org/show_bug.cgi?id=82935 tommy27 ba...@quipo.it changed: What|Removed |Added Status|UNCONFIRMED |RESOLVED Resolution|--- |DUPLICATE CC||ba...@quipo.it --- Comment #1 from tommy27 ba...@quipo.it --- already known issue *** This bug has been marked as a duplicate of bug 64490 *** -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82723] VIEWING: If text is longer than 1 page in web view, changing zoom size crashes Libreoffice
https://bugs.freedesktop.org/show_bug.cgi?id=82723 --- Comment #7 from Robo Pluhar robo-plu...@email.cz --- I have similar (or the same) problem with longer document, zoom 100% and Web layout. Writer had worked like charm untill 450.000 chars (Libre office 2.5.2 Xubuntu 12.04, X86). After adding some text, Writer started crashing. I upgraded Libre office to 4.3.0.4 (still Xubuntu 12.04, X86) and it crashes short time after document opening. The same problem I have on another computer with Libre office 4.3.0.4 Win7 64b. See the document in attachment (Large lorem ipsum ODT document (532.000 chars)) - it crashes after switching to Web layout (zoomed 100%). In Print Layout there are no similar problems. -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
[Libreoffice-bugs] [Bug 82599] Insertkey works wrong in the Formular editor
https://bugs.freedesktop.org/show_bug.cgi?id=82599 domenik.h...@ubm.de changed: What|Removed |Added Summary|VIEWING: Inserkey works |Insertkey works wrong in |wrong in the Formular |the Formular editor |editor | -- You are receiving this mail because: You are the assignee for the bug. ___ Libreoffice-bugs mailing list Libreoffice-bugs@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
