You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by hd...@apache.org on 2013/07/19 17:59:11 UTC
svn commit: r1504925 [5/12] - in /openoffice/branches/rejuvenate01:
ext_libraries/apr-util/ ext_libraries/coinmp/ ext_libraries/serf/
ext_libraries/serf/win/ ext_sources/ main/
main/accessibility/bridge/org/openoffice/java/accessibility/
main/basctl/so...
Modified: openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno.cxx (original)
+++ openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno.cxx Fri Jul 19 15:59:04 2013
@@ -357,8 +357,6 @@ PyObject *PyUNO_invoke( PyObject *object
callable = PyUNO_callable_new (
me->members->xInvocation,
attrName,
- runtime.getImpl()->cargo->xInvocation,
- runtime.getImpl()->cargo->xTypeConverter,
ACCEPT_UNO_ANY);
paras = args;
}
@@ -515,9 +513,7 @@ PyObject* PyUNO_getattr (PyObject* self,
//Create a callable object to invoke this...
PyRef ret = PyUNO_callable_new (
me->members->xInvocation,
- attrName,
- runtime.getImpl()->cargo->xInvocation,
- runtime.getImpl()->cargo->xTypeConverter);
+ attrName);
Py_XINCREF( ret.get() );
return ret.get();
Modified: openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_callable.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_callable.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_callable.cxx (original)
+++ openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_callable.cxx Fri Jul 19 15:59:04 2013
@@ -44,8 +44,6 @@ namespace pyuno
typedef struct
{
Reference<XInvocation2> xInvocation;
- Reference<XSingleServiceFactory> xInvocationFactory;
- Reference<XTypeConverter> xTypeConverter;
OUString methodName;
ConversionMode mode;
} PyUNO_callable_Internals;
@@ -249,8 +247,6 @@ static PyTypeObject PyUNO_callable_Type
PyRef PyUNO_callable_new (
const Reference<XInvocation2> &my_inv,
const OUString & methodName,
- const Reference<XSingleServiceFactory> &xInvocationFactory,
- const Reference<XTypeConverter> &tc,
enum ConversionMode mode )
{
PyUNO_callable* self;
@@ -262,8 +258,6 @@ PyRef PyUNO_callable_new (
self->members = new PyUNO_callable_Internals;
self->members->xInvocation = my_inv;
self->members->methodName = methodName;
- self->members->xInvocationFactory = xInvocationFactory;
- self->members->xTypeConverter = tc;
self->members->mode = mode;
return PyRef( (PyObject*)self, SAL_NO_ACQUIRE );
Modified: openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_impl.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_impl.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_impl.hxx (original)
+++ openoffice/branches/rejuvenate01/main/pyuno/source/module/pyuno_impl.hxx Fri Jul 19 15:59:04 2013
@@ -158,8 +158,6 @@ com::sun::star::uno::TypeClass StringToT
PyRef PyUNO_callable_new (
const com::sun::star::uno::Reference<com::sun::star::script::XInvocation2> &xInv,
const rtl::OUString &methodName,
- const com::sun::star::uno::Reference<com::sun::star::lang::XSingleServiceFactory> &ssf,
- const com::sun::star::uno::Reference<com::sun::star::script::XTypeConverter> &tc,
ConversionMode mode = REJECT_UNO_ANY );
PyObject* PyUNO_Type_new (const char *typeName , com::sun::star::uno::TypeClass t , const Runtime &r );
Modified: openoffice/branches/rejuvenate01/main/pyuno/zipcore/python.sh
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/pyuno/zipcore/python.sh?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/pyuno/zipcore/python.sh (original)
+++ openoffice/branches/rejuvenate01/main/pyuno/zipcore/python.sh Fri Jul 19 15:59:04 2013
@@ -38,7 +38,7 @@ PATH=$sd_prog${PATH+:$PATH}
export PATH
# Set LD_LIBRARY_PATH so that "import pyuno" finds libpyuno.so:
-LD_LIBRARY_PATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/ure-link/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+LD_LIBRARY_PATH=$sd_prog:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
# Set UNO_PATH so that "officehelper.bootstrap()" can find soffice executable:
@@ -50,10 +50,10 @@ export UNO_PATH
: ${URE_BOOTSTRAP=vnd.sun.star.pathname:$sd_prog/fundamentalrc}
export URE_BOOTSTRAP
-PYTHONPATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/lib-dynload:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/lib-tk:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/site-packages${PYTHONPATH+:$PYTHONPATH}
+PYTHONPATH=$sd_prog:$sd_prog/python-core-%%PYVERSION%%/lib:$sd_prog/python-core-%%PYVERSION%%/lib/lib-dynload:$sd_prog/python-core-%%PYVERSION%%/lib/lib-tk:$sd_prog/python-core-%%PYVERSION%%/lib/site-packages${PYTHONPATH+:$PYTHONPATH}
export PYTHONPATH
-PYTHONHOME=$sd_prog/../basis-link/program/python-core-%%PYVERSION%%
+PYTHONHOME=$sd_prog/python-core-%%PYVERSION%%
export PYTHONHOME
# execute binary
-exec "$sd_prog/../basis-link/program/python.bin" "$@"
+exec "$sd_prog/python.bin" "$@"
Modified: openoffice/branches/rejuvenate01/main/sal/inc/sal/mathconf.h
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/inc/sal/mathconf.h?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sal/inc/sal/mathconf.h (original)
+++ openoffice/branches/rejuvenate01/main/sal/inc/sal/mathconf.h Fri Jul 19 15:59:04 2013
@@ -55,16 +55,16 @@ extern "C" {
/* SAL_MATH_FINITE(d): test double d on INFINITY, NaN et al. */
-#if defined(__GNUC__)
-#if defined(MACOSX)
- #define SAL_MATH_FINITE(d) finite(d)
-#else
- #define SAL_MATH_FINITE(d) __builtin_isfinite(d) // gcc bug 14608
-#endif
+#if defined(__GNUC__) // workaround gcc bug 14608
+ #if (__GNUC_MINOR__ >= 3) // gcc>=4.3 has a builtin
+ #define SAL_MATH_FINITE(d) __builtin_isfinite(d)
+ #else
+ #define SAL_MATH_FINITE(d) finite(d) // fall back to pre-C99 name
+ #endif
#elif defined(__STDC__)
// isfinite() should be available in math.h according to C99,C++99,SUSv3,etc.
- // unless GCC bug 14608 hits us where cmath undefines isfinite as macro
- #define SAL_MATH_FINITE(d) isfinite(d)
+ // unless GCC bug 14608 hits us where cmath undefines isfinite() as macro
+ #define SAL_MATH_FINITE(d) isfinite(d)
#elif defined( WNT)
#define SAL_MATH_FINITE(d) _finite(d)
#elif defined OS2
Modified: openoffice/branches/rejuvenate01/main/sal/systools/win32/kill/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sal/systools/win32/kill/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sal/systools/win32/kill/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/sal/systools/win32/kill/makefile.mk Fri Jul 19 15:59:04 2013
@@ -38,6 +38,10 @@ TARGETTYPE=CUI
CDEFS=-D_WIN32_WINNT=0x0501
.ENDIF
+.IF "$(USE_SYSTEM_STL)" != "YES" && "$(PRODUCT)" = ""
+CDEFS+=-D_DEBUG
+.ENDIF
+
CFLAGS+= $(LFS_CFLAGS)
CXXFLAGS+= $(LFS_CFLAGS)
Modified: openoffice/branches/rejuvenate01/main/sc/inc/document.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/inc/document.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/inc/document.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/inc/document.hxx Fri Jul 19 15:59:04 2013
@@ -435,6 +435,9 @@ private:
bool mbChangeReadOnlyEnabled; // allow changes in read-only document (for API import filters)
bool mbStreamValidLocked;
+ // #118840# Have a flag to know that this ScDocument is used temporary
+ bool mbIsTemporary : 1;
+
sal_Int16 mnNamedRangesLockCount;
public:
@@ -611,6 +614,10 @@ public:
void SetStreamValid( SCTAB nTab, sal_Bool bSet, sal_Bool bIgnoreLock = sal_False );
void LockStreamValid( bool bLock );
bool IsStreamValidLocked() const { return mbStreamValidLocked; }
+
+ // #118840# Have a flag to know that this ScDocument is used temporary
+ bool IsTemporary() const { return mbIsTemporary; }
+
SC_DLLPUBLIC sal_Bool IsPendingRowHeights( SCTAB nTab ) const;
SC_DLLPUBLIC void SetPendingRowHeights( SCTAB nTab, sal_Bool bSet );
SC_DLLPUBLIC void SetLayoutRTL( SCTAB nTab, sal_Bool bRTL );
Modified: openoffice/branches/rejuvenate01/main/sc/inc/drwlayer.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/inc/drwlayer.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/inc/drwlayer.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/inc/drwlayer.hxx Fri Jul 19 15:59:04 2013
@@ -146,7 +146,7 @@ public:
void EnableAdjust( sal_Bool bSet = sal_True ) { bAdjustEnabled = bSet; }
- void BeginCalcUndo();
+ void BeginCalcUndo(bool bDisableTextEditUsesCommonUndoManager);
SdrUndoGroup* GetCalcUndo();
sal_Bool IsRecording() const { return bRecording; }
void AddCalcUndo( SdrUndoAction* pUndo );
Modified: openoffice/branches/rejuvenate01/main/sc/source/core/data/documen2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/core/data/documen2.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/core/data/documen2.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/core/data/documen2.cxx Fri Jul 19 15:59:04 2013
@@ -215,6 +215,7 @@ ScDocument::ScDocument( ScDocumentMode e
mbExecuteLinkEnabled( true ),
mbChangeReadOnlyEnabled( false ),
mbStreamValidLocked( false ),
+ mbIsTemporary(false), // #118840#
mnNamedRangesLockCount( 0 )
{
SetStorageGrammar( formula::FormulaGrammar::GRAM_STORAGE_DEFAULT);
Modified: openoffice/branches/rejuvenate01/main/sc/source/core/data/documen9.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/core/data/documen9.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/core/data/documen9.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/core/data/documen9.cxx Fri Jul 19 15:59:04 2013
@@ -75,7 +75,7 @@ SfxBroadcaster* ScDocument::GetDrawBroad
void ScDocument::BeginDrawUndo()
{
if (pDrawLayer)
- pDrawLayer->BeginCalcUndo();
+ pDrawLayer->BeginCalcUndo(false);
}
sal_Bool ScDocument::IsDrawRecording() const
Modified: openoffice/branches/rejuvenate01/main/sc/source/core/data/drwlayer.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/core/data/drwlayer.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/core/data/drwlayer.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/core/data/drwlayer.cxx Fri Jul 19 15:59:04 2013
@@ -860,10 +860,10 @@ void ScDrawLayer::AddCalcUndo( SdrUndoAc
delete pUndo;
}
-void ScDrawLayer::BeginCalcUndo()
+void ScDrawLayer::BeginCalcUndo(bool bDisableTextEditUsesCommonUndoManager)
{
//! DBG_ASSERT( !bRecording, "BeginCalcUndo ohne GetCalcUndo" );
-
+ SetDisableTextEditUsesCommonUndoManager(bDisableTextEditUsesCommonUndoManager);
DELETEZ(pUndoGroup);
bRecording = sal_True;
}
@@ -875,6 +875,7 @@ SdrUndoGroup* ScDrawLayer::GetCalcUndo()
SdrUndoGroup* pRet = pUndoGroup;
pUndoGroup = NULL;
bRecording = sal_False;
+ SetDisableTextEditUsesCommonUndoManager(false);
return pRet;
}
Modified: openoffice/branches/rejuvenate01/main/sc/source/filter/html/htmlpars.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/filter/html/htmlpars.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/filter/html/htmlpars.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/filter/html/htmlpars.cxx Fri Jul 19 15:59:04 2013
@@ -1897,40 +1897,6 @@ ScHTMLTable* ScHTMLTableMap::CreateTable
return pTable;
}
-// ----------------------------------------------------------------------------
-
-/** Simplified forward iterator for convenience.
-
- Before the iterator can be dereferenced, it must be tested with the is()
- method. The iterator may be invalid directly after construction (e.g. empty
- container).
- */
-class ScHTMLTableIterator
-{
-public:
- /** Constructs the iterator for the passed table map.
- @param pTableMap Pointer to the table map (is allowed to be NULL). */
- explicit ScHTMLTableIterator( const ScHTMLTableMap* pTableMap );
-
- inline bool is() const { return maIter != maEnd; }
- inline ScHTMLTable* operator->() { return maIter->second.get(); }
- inline ScHTMLTable& operator*() { return *maIter->second; }
- inline ScHTMLTableIterator& operator++() { ++maIter; return *this; }
-
-private:
- ScHTMLTableMap::const_iterator maIter;
- ScHTMLTableMap::const_iterator maEnd;
-};
-
-ScHTMLTableIterator::ScHTMLTableIterator( const ScHTMLTableMap* pTableMap )
-{
- if( pTableMap )
- {
- maIter = pTableMap->begin();
- maEnd = pTableMap->end();
- }
-}
-
// ============================================================================
ScHTMLTableAutoId::ScHTMLTableAutoId( ScHTMLTableId& rnUnusedId ) :
@@ -2299,8 +2265,15 @@ void ScHTMLTable::ApplyCellBorders( ScDo
}
}
- for( ScHTMLTableIterator aIter( mxNestedTables.get() ); aIter.is(); ++aIter )
- aIter->ApplyCellBorders( pDoc, rFirstPos );
+ if ( mxNestedTables.get() )
+ {
+ for ( ScHTMLTableMap::const_iterator aIter( mxNestedTables->begin() );
+ aIter != mxNestedTables->end(); ++aIter )
+ {
+ if ( aIter->second.get() )
+ aIter->second->ApplyCellBorders( pDoc, rFirstPos );
+ }
+ }
}
// ----------------------------------------------------------------------------
@@ -2593,8 +2566,15 @@ void ScHTMLTable::CalcNeededDocSize(
void ScHTMLTable::FillEmptyCells()
{
- for( ScHTMLTableIterator aIter( mxNestedTables.get() ); aIter.is(); ++aIter )
- aIter->FillEmptyCells();
+ if ( mxNestedTables.get() )
+ {
+ for ( ScHTMLTableMap::const_iterator aIter( mxNestedTables->begin() );
+ aIter != mxNestedTables->end(); ++aIter )
+ {
+ if ( aIter->second.get() )
+ aIter->second->FillEmptyCells();
+ }
+ }
// insert the final vertically merged ranges into maUsedCells
for( const ScRange* pRange = maVMergedCells.First(); pRange; pRange = maVMergedCells.Next() )
@@ -2627,8 +2607,15 @@ void ScHTMLTable::FillEmptyCells()
void ScHTMLTable::RecalcDocSize()
{
// recalc table sizes recursively from inner to outer
- for( ScHTMLTableIterator aIter( mxNestedTables.get() ); aIter.is(); ++aIter )
- aIter->RecalcDocSize();
+ if ( mxNestedTables.get() )
+ {
+ for ( ScHTMLTableMap::const_iterator aIter( mxNestedTables->begin() );
+ aIter != mxNestedTables->end(); ++aIter )
+ {
+ if ( aIter->second.get() )
+ aIter->second->RecalcDocSize();
+ }
+ }
/* Two passes: first calculates the sizes of single columns/rows, then
the sizes of spanned columns/rows. This allows to fill nested tables
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/dbdocfun.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/dbdocfun.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/dbdocfun.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/dbdocfun.cxx Fri Jul 19 15:59:04 2013
@@ -541,7 +541,7 @@ sal_Bool ScDBDocFunc::Sort( SCTAB nTab,
// #i59745# collect all drawing undo actions affecting cell note captions
if( pDrawLayer )
- pDrawLayer->BeginCalcUndo();
+ pDrawLayer->BeginCalcUndo(false);
}
if ( bCopy )
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/docfunc.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/docfunc.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/docfunc.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/docfunc.cxx Fri Jul 19 15:59:04 2013
@@ -190,7 +190,7 @@ sal_Bool ScDocFunc::DetectiveAddPred(con
SCTAB nTab = rPos.Tab();
if (bUndo)
- pModel->BeginCalcUndo();
+ pModel->BeginCalcUndo(false);
sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowPred( nCol, nRow );
SdrUndoGroup* pUndo = NULL;
if (bUndo)
@@ -231,7 +231,7 @@ sal_Bool ScDocFunc::DetectiveDelPred(con
SCTAB nTab = rPos.Tab();
if (bUndo)
- pModel->BeginCalcUndo();
+ pModel->BeginCalcUndo(false);
sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).DeletePred( nCol, nRow );
SdrUndoGroup* pUndo = NULL;
if (bUndo)
@@ -270,7 +270,7 @@ sal_Bool ScDocFunc::DetectiveAddSucc(con
SCTAB nTab = rPos.Tab();
if (bUndo)
- pModel->BeginCalcUndo();
+ pModel->BeginCalcUndo(false);
sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowSucc( nCol, nRow );
SdrUndoGroup* pUndo = NULL;
if (bUndo)
@@ -311,7 +311,7 @@ sal_Bool ScDocFunc::DetectiveDelSucc(con
SCTAB nTab = rPos.Tab();
if (bUndo)
- pModel->BeginCalcUndo();
+ pModel->BeginCalcUndo(false);
sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).DeleteSucc( nCol, nRow );
SdrUndoGroup* pUndo = NULL;
if (bUndo)
@@ -350,7 +350,7 @@ sal_Bool ScDocFunc::DetectiveAddError(co
SCTAB nTab = rPos.Tab();
if (bUndo)
- pModel->BeginCalcUndo();
+ pModel->BeginCalcUndo(false);
sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).ShowError( nCol, nRow );
SdrUndoGroup* pUndo = NULL;
if (bUndo)
@@ -389,7 +389,7 @@ sal_Bool ScDocFunc::DetectiveMarkInvalid
if (pWaitWin)
pWaitWin->EnterWait();
if (bUndo)
- pModel->BeginCalcUndo();
+ pModel->BeginCalcUndo(false);
sal_Bool bOverflow;
sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).MarkInvalid( bOverflow );
SdrUndoGroup* pUndo = NULL;
@@ -429,7 +429,7 @@ sal_Bool ScDocFunc::DetectiveDelAll(SCTA
ScDocShellModificator aModificator( rDocShell );
if (bUndo)
- pModel->BeginCalcUndo();
+ pModel->BeginCalcUndo(false);
sal_Bool bDone = ScDetectiveFunc( pDoc,nTab ).DeleteAll( SC_DET_DETECTIVE );
SdrUndoGroup* pUndo = NULL;
if (bUndo)
@@ -471,7 +471,7 @@ sal_Bool ScDocFunc::DetectiveRefresh( sa
rDocShell.MakeDrawLayer();
ScDrawLayer* pModel = pDoc->GetDrawLayer();
if (bUndo)
- pModel->BeginCalcUndo();
+ pModel->BeginCalcUndo(false);
// Loeschen auf allen Tabellen
@@ -1147,7 +1147,7 @@ bool ScDocFunc::ReplaceNote( const ScAdd
// collect drawing undo actions for deleting/inserting caption obejcts
if( pUndoMgr )
- pDrawLayer->BeginCalcUndo();
+ pDrawLayer->BeginCalcUndo(false);
// delete the note (creates drawing undo action for the caption object)
delete pOldNote;
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/docsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/docsh.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/docsh.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/docshell/docsh.cxx Fri Jul 19 15:59:04 2013
@@ -2589,6 +2589,13 @@ ScDocShell::ScDocShell( const sal_uInt64
bIsInplace = (GetCreateMode() == SFX_CREATE_MODE_EMBEDDED);
// wird zurueckgesetzt, wenn nicht inplace
+ // #118840# set flag at ScDocument that it is used temporary (e.g. inplace
+ // for transporting a chart over the clipboard)
+ if(bIsInplace)
+ {
+ aDocument.mbIsTemporary = true;
+ }
+
pDocFunc = new ScDocFunc(*this);
// SetBaseModel needs exception handling
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/drawfunc/futext3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/drawfunc/futext3.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/drawfunc/futext3.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/drawfunc/futext3.cxx Fri Jul 19 15:59:04 2013
@@ -87,14 +87,18 @@ void FuText::StopEditMode(sal_Bool /*bTe
{
/* Put all undo actions already collected (e.g. create caption object)
and all following undo actions (text changed) together into a ListAction. */
- String aUndoStr = ScGlobal::GetRscString( STR_UNDO_EDITNOTE );
- pUndoMgr->EnterListAction( aUndoStr, aUndoStr );
- if( SdrUndoGroup* pCalcUndo = pDrawLayer->GetCalcUndo() )
+ SdrUndoGroup* pCalcUndo = pDrawLayer->GetCalcUndo();
+
+ if(pCalcUndo)
{
+ const String aUndoStr = ScGlobal::GetRscString( STR_UNDO_EDITNOTE );
+ pUndoMgr->EnterListAction( aUndoStr, aUndoStr );
+
/* Note has been created before editing, if first undo action is
an insert action. Needed below to decide whether to drop the
undo if editing a new note has been cancelled. */
bNewNote = (pCalcUndo->GetActionCount() > 0) && pCalcUndo->GetAction( 0 )->ISA( SdrUndoNewObj );
+
// create a "insert note" undo action if needed
if( bNewNote )
pUndoMgr->AddUndoAction( new ScUndoReplaceNote( *pDocShell, aNotePos, pNote->GetNoteData(), true, pCalcUndo ) );
@@ -140,7 +144,7 @@ void FuText::StopEditMode(sal_Bool /*bTe
if( pUndoMgr )
{
// collect the "remove object" drawing undo action created by DeleteNote()
- pDrawLayer->BeginCalcUndo();
+ pDrawLayer->BeginCalcUndo(false);
// rescue note data before deletion
ScNoteData aNoteData( pNote->GetNoteData() );
// delete note from document (removes caption, but does not delete it)
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/inc/undobase.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/inc/undobase.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/inc/undobase.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/inc/undobase.hxx Fri Jul 19 15:59:04 2013
@@ -155,8 +155,8 @@ public:
SfxUndoAction* GetWrappedUndo() { return pWrappedUndo; }
void ForgetWrappedUndo();
- virtual sal_Bool IsLinked();
- virtual void SetLinked( sal_Bool bIsLinked );
+ virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction);
+
virtual void Undo();
virtual void Redo();
virtual void Repeat(SfxRepeatTarget& rTarget);
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/inc/undodraw.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/inc/undodraw.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/inc/undodraw.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/inc/undodraw.hxx Fri Jul 19 15:59:04 2013
@@ -43,9 +43,9 @@ public:
SfxUndoAction* GetDrawUndo() { return pDrawUndo; }
void ForgetDrawUndo();
- virtual sal_Bool IsLinked();
- virtual void SetLinked( sal_Bool bIsLinked );
- virtual void Undo();
+ virtual void SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction);
+
+ virtual void Undo();
virtual void Redo();
virtual void Repeat(SfxRepeatTarget& rTarget);
virtual sal_Bool CanRepeat(SfxRepeatTarget& rTarget) const;
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx Fri Jul 19 15:59:04 2013
@@ -24,6 +24,7 @@
#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include <sfx2/sidebar/Theme.hxx>
#include <sfx2/sidebar/ControlFactory.hxx>
+#include <sfx2/sidebar/Layouter.hxx>
#include <AlignmentPropertyPanel.hxx>
#include <AlignmentPropertyPanel.hrc>
#include <svx/dialmgr.hxx>
@@ -38,6 +39,7 @@
using namespace css;
using namespace cssu;
+using ::sfx2::sidebar::Layouter;
using ::sfx2::sidebar::ControlFactory;
#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
@@ -98,6 +100,13 @@ AlignmentPropertyPanel::AlignmentPropert
mpFTLeftIndent->SetBackground(Wallpaper());
mpFtRotate->SetBackground(Wallpaper());
+
+ Layouter::PrepareForLayouting(*mpFTLeftIndent);
+ Layouter::PrepareForLayouting(*mpFtRotate);
+ Layouter::PrepareForLayouting(*mpCBXWrapText);
+ Layouter::PrepareForLayouting(*mpCBXMergeCell);
+ Layouter::PrepareForLayouting(*mpCbStacked);
+
}
//////////////////////////////////////////////////////////////////////////////
@@ -630,10 +639,17 @@ void AlignmentPropertyPanel::UpdateVerAl
}
}
-//////////////////////////////////////////////////////////////////////////////
-// namespace close
-}} // end of namespace ::sc::sidebar
-//////////////////////////////////////////////////////////////////////////////
-// eof
+
+void AlignmentPropertyPanel::Resize (void)
+{
+ const sal_Int32 nRight (GetSizePixel().Width() - Layouter::MapWidth(*this, TB_BORDER));
+ Layouter::SetRight(*mpFtRotate, nRight);
+ Layouter::SetRight(*mpCBXWrapText, nRight);
+ Layouter::SetRight(*mpCBXMergeCell, nRight);
+ Layouter::SetRight(*mpCbStacked, nRight);
+}
+
+
+}} // end of namespace ::sc::sidebar
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx Fri Jul 19 15:59:04 2013
@@ -61,6 +61,8 @@ public:
SfxBindings* GetBindings();
+ virtual void Resize (void);
+
private:
//ui controls
::boost::scoped_ptr<Window> mpTBHorizontalBackground;
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx Fri Jul 19 15:59:04 2013
@@ -24,6 +24,7 @@
#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include <sfx2/sidebar/Theme.hxx>
#include <sfx2/sidebar/ControlFactory.hxx>
+#include <sfx2/sidebar/Layouter.hxx>
#include <CellAppearancePropertyPanel.hxx>
#include <CellAppearancePropertyPanel.hrc>
#include "sc.hrc"
@@ -48,6 +49,8 @@
using namespace css;
using namespace cssu;
+using ::sfx2::sidebar::Layouter;
+
#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
@@ -247,6 +250,9 @@ CellAppearancePropertyPanel::CellAppeara
{
Initialize();
FreeResource();
+
+ Layouter::PrepareForLayouting(*mpFTFillColor);
+ Layouter::PrepareForLayouting(*mpFTCellBorder);
}
//////////////////////////////////////////////////////////////////////////////
@@ -873,8 +879,18 @@ void CellAppearancePropertyPanel::Update
}
}
-//////////////////////////////////////////////////////////////////////////////
-// namespace close
+
+
+
+void CellAppearancePropertyPanel::Resize (void)
+{
+ const sal_Int32 nRight (GetSizePixel().Width() - Layouter::MapWidth(*this, TB_BORDER));
+ Layouter::SetRight(*mpFTFillColor, nRight);
+ Layouter::SetRight(*mpFTCellBorder, nRight);
+ Layouter::SetRight(*mpCBXShowGrid, nRight);
+}
+
+
}} // end of namespace ::sc::sidebar
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx Fri Jul 19 15:59:04 2013
@@ -69,6 +69,8 @@ public:
SfxBindings* GetBindings();
+ virtual void Resize (void);
+
private:
//ui controls
::boost::scoped_ptr< FixedText > mpFTFillColor;
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx Fri Jul 19 15:59:04 2013
@@ -23,6 +23,7 @@
#include <sfx2/sidebar/ResourceDefinitions.hrc>
#include <sfx2/sidebar/Theme.hxx>
+#include <sfx2/sidebar/Layouter.hxx>
#include <sfx2/sidebar/ControlFactory.hxx>
#include <NumberFormatPropertyPanel.hxx>
#include <NumberFormatPropertyPanel.hrc>
@@ -40,6 +41,7 @@
using namespace css;
using namespace cssu;
+using ::sfx2::sidebar::Layouter;
using ::sfx2::sidebar::Theme;
#define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
@@ -81,6 +83,10 @@ NumberFormatPropertyPanel::NumberFormatP
{
Initialize();
FreeResource();
+
+ Layouter::PrepareForLayouting(*mpFtCategory);
+ Layouter::PrepareForLayouting(*mpFtDecimals);
+ Layouter::PrepareForLayouting(*mpFtLeadZeroes);
}
//////////////////////////////////////////////////////////////////////////////
@@ -393,8 +399,17 @@ SfxBindings* NumberFormatPropertyPanel::
return mpBindings;
}
-//////////////////////////////////////////////////////////////////////////////
-// namespace close
+
+
+
+void NumberFormatPropertyPanel::Resize (void)
+{
+ const sal_Int32 nRight (GetSizePixel().Width() - Layouter::MapWidth(*this, TB_BORDER));
+ Layouter::SetRight(*mpFtCategory, nRight);
+ Layouter::SetRight(*mpFtLeadZeroes, nRight);
+ Layouter::SetRight(*mpBtnNegRed, nRight);
+ Layouter::SetRight(*mpBtnThousand, nRight);
+}
}} // end of namespace ::sc::sidebar
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx Fri Jul 19 15:59:04 2013
@@ -58,6 +58,8 @@ public:
SfxBindings* GetBindings();
+ virtual void Resize (void);
+
private:
//ui controls
::boost::scoped_ptr< FixedText > mpFtCategory;
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/undo/undobase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/undo/undobase.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/undo/undobase.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/undo/undobase.cxx Fri Jul 19 15:59:04 2013
@@ -519,18 +519,12 @@ sal_uInt16 ScUndoWrapper::GetId() const
return 0;
}
-sal_Bool ScUndoWrapper::IsLinked()
+void ScUndoWrapper::SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction)
{
if (pWrappedUndo)
- return pWrappedUndo->IsLinked();
+ pWrappedUndo->SetLinkToSfxLinkUndoAction(pSfxLinkUndoAction);
else
- return sal_False;
-}
-
-void ScUndoWrapper::SetLinked( sal_Bool bIsLinked )
-{
- if (pWrappedUndo)
- pWrappedUndo->SetLinked(bIsLinked);
+ SetLinkToSfxLinkUndoAction(pSfxLinkUndoAction);
}
sal_Bool ScUndoWrapper::Merge( SfxUndoAction* pNextAction )
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/undo/undodraw.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/undo/undodraw.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/undo/undodraw.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/undo/undodraw.cxx Fri Jul 19 15:59:04 2013
@@ -79,18 +79,12 @@ sal_uInt16 __EXPORT ScUndoDraw::GetId()
return 0;
}
-sal_Bool __EXPORT ScUndoDraw::IsLinked()
+void __EXPORT ScUndoDraw::SetLinkToSfxLinkUndoAction(SfxLinkUndoAction* pSfxLinkUndoAction)
{
if (pDrawUndo)
- return pDrawUndo->IsLinked();
- else
- return sal_False;
-}
-
-void __EXPORT ScUndoDraw::SetLinked( sal_Bool bIsLinked )
-{
- if (pDrawUndo)
- pDrawUndo->SetLinked(bIsLinked);
+ pDrawUndo->SetLinkToSfxLinkUndoAction(pSfxLinkUndoAction);
+ else
+ SetLinkToSfxLinkUndoAction(pSfxLinkUndoAction);
}
sal_Bool __EXPORT ScUndoDraw::Merge( SfxUndoAction* pNextAction )
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/unoobj/chart2uno.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/unoobj/chart2uno.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/unoobj/chart2uno.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/unoobj/chart2uno.cxx Fri Jul 19 15:59:04 2013
@@ -2176,7 +2176,16 @@ rtl::OUString SAL_CALL ScChart2DataProvi
}
OUString aRet;
- ScRangeStringConverter::GetStringFromXMLRangeString(aRet, sXMLRange, m_pDocument);
+
+ // #118840# Only interpret range string when the ScDocument is not just used
+ // temporary (e.g. for transporting a chart over the clipboard). In that case, the local
+ // cell data would be invalid; despite the fact that a 'Sheet1' exists (just because
+ // it's the default)
+ if(!m_pDocument->IsTemporary())
+ {
+ ScRangeStringConverter::GetStringFromXMLRangeString(aRet, sXMLRange, m_pDocument);
+ }
+
return aRet;
}
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/view/drawview.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/view/drawview.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/view/drawview.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/view/drawview.cxx Fri Jul 19 15:59:04 2013
@@ -835,7 +835,7 @@ void ScDrawView::DeleteMarked()
DBG_ASSERT( aNoteData.mpCaption == pCaptObj, "ScDrawView::DeleteMarked - caption object does not match" );
// collect the drawing undo action created while deleting the note
if( bUndo )
- pDrawLayer->BeginCalcUndo();
+ pDrawLayer->BeginCalcUndo(false);
// delete the note (already removed from document above)
delete pNote;
// add the undo action for the note
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/view/gridwin.cxx Fri Jul 19 15:59:04 2013
@@ -3564,6 +3564,13 @@ sal_Int8 ScGridWindow::AcceptDrop( const
else
{
sal_Int8 nMyAction = rEvt.mnAction;
+
+ // clear DND_ACTION_LINK when other actions are set. The usage below cannot handle
+ // multiple set values
+ if((nMyAction & DND_ACTION_LINK) && (nMyAction & (DND_ACTION_COPYMOVE)))
+ {
+ nMyAction &= ~DND_ACTION_LINK;
+ }
if ( !rData.pDrawTransfer ||
!IsMyModel(rData.pDrawTransfer->GetDragSourceView()) ) // drawing within the document
@@ -3573,7 +3580,7 @@ sal_Int8 ScGridWindow::AcceptDrop( const
ScDocument* pThisDoc = pViewData->GetDocument();
SdrObject* pHitObj = pThisDoc->GetObjectAtPoint(
pViewData->GetTabNo(), PixelToLogic(rEvt.maPosPixel) );
- if ( pHitObj && nMyAction == DND_ACTION_LINK && !rData.pDrawTransfer )
+ if ( pHitObj && nMyAction == DND_ACTION_LINK ) // && !rData.pDrawTransfer )
{
if ( IsDropFormatSupported(SOT_FORMATSTR_ID_SVXB)
|| IsDropFormatSupported(SOT_FORMAT_GDIMETAFILE)
@@ -4191,8 +4198,9 @@ sal_Int8 ScGridWindow::ExecuteDrop( cons
}
Point aLogicPos = PixelToLogic(aPos);
+ sal_Bool bIsLink = ( rEvt.mnAction == DND_ACTION_LINK );
- if (rData.pDrawTransfer)
+ if (!bIsLink && rData.pDrawTransfer)
{
sal_uInt16 nFlags = rData.pDrawTransfer->GetDragSourceFlags();
@@ -4228,8 +4236,6 @@ sal_Int8 ScGridWindow::ExecuteDrop( cons
}
}
- sal_Bool bIsLink = ( rEvt.mnAction == DND_ACTION_LINK );
-
ScDocument* pThisDoc = pViewData->GetDocument();
SdrObject* pHitObj = pThisDoc->GetObjectAtPoint( pViewData->GetTabNo(), PixelToLogic(aPos) );
if ( pHitObj && bIsLink )
Modified: openoffice/branches/rejuvenate01/main/sc/source/ui/view/viewfun6.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sc/source/ui/view/viewfun6.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sc/source/ui/view/viewfun6.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sc/source/ui/view/viewfun6.cxx Fri Jul 19 15:59:04 2013
@@ -159,7 +159,7 @@ void ScViewFunc::EditNote()
// start drawing undo to catch undo action for insertion of the caption object
pDocSh->MakeDrawLayer();
ScDrawLayer* pDrawLayer = pDoc->GetDrawLayer();
- pDrawLayer->BeginCalcUndo();
+ pDrawLayer->BeginCalcUndo(true);
// generated undo action is processed in FuText::StopEditMode
// get existing note or create a new note (including caption drawing object)
Modified: openoffice/branches/rejuvenate01/main/scp2/source/ooo/common_brand.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/scp2/source/ooo/common_brand.scp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/scp2/source/ooo/common_brand.scp (original)
+++ openoffice/branches/rejuvenate01/main/scp2/source/ooo/common_brand.scp Fri Jul 19 15:59:04 2013
@@ -848,6 +848,15 @@ ProfileItem gid_Brand_Profileitem_Soffic
Value = "${PROGRESSFRAMECOLOR}";
End
+ProfileItem gid_Brand_Profileitem_Soffice_ShowProgressFrame_So
+ ProfileID = gid_Brand_Profile_Soffice_Ini;
+ ModuleID = gid_Module_Root_Brand;
+ Section = "Bootstrap";
+ Order = 5;
+ Key = "ShowProgressFrame";
+ Value = "${SHOWPROGRESSFRAME}";
+End
+
ProfileItem gid_Brand_Profileitem_Soffice_NativeProgress_So
ProfileID = gid_Brand_Profile_Soffice_Ini;
ModuleID = gid_Module_Root_Brand;
Modified: openoffice/branches/rejuvenate01/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/scp2/source/ooo/file_library_ooo.scp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ openoffice/branches/rejuvenate01/main/scp2/source/ooo/file_library_ooo.scp Fri Jul 19 15:59:04 2013
@@ -1138,6 +1138,13 @@ File gid_File_Lib_Deployment
PACKED_LIB_FILE_BODY;
End
+#ifdef OS2
+STD_LIB_FILE(gid_File_Lib_DeploymentGui, deplgui)
+#else
+STD_LIB_FILE(gid_File_Lib_DeploymentGui, deploymentgui.uno)
+#endif
+
+/*
File gid_File_Lib_DeploymentGui
#if defined UNX
Name = STRING(CONCAT4(deploymentgui,DLLPOSTFIX,.uno,UNXSUFFIX));
@@ -1148,6 +1155,7 @@ File gid_File_Lib_DeploymentGui
#endif
PACKED_LIB_FILE_BODY;
End
+*/
#ifdef OS2
STD_LIB_FILE(gid_File_Lib_DeploymentMisc, deplmisc)
Modified: openoffice/branches/rejuvenate01/main/scp2/source/ooo/registryitem_ooo.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/scp2/source/ooo/registryitem_ooo.scp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/scp2/source/ooo/registryitem_ooo.scp (original)
+++ openoffice/branches/rejuvenate01/main/scp2/source/ooo/registryitem_ooo.scp Fri Jul 19 15:59:04 2013
@@ -325,77 +325,77 @@ RegistryItem gid_Regitem_Software_OpenOf
Styles = (ALWAYS_REQUIRED);
End
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
- ModuleID = gid_Module_Root;
- Name = "BASISINSTALLLOCATION";
- Value = "[INSTALLLOCATION]Basis\\";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
- ModuleID = gid_Module_Root;
- Name = "BASISINSTALLLOCATION";
- Value = "[INSTALLLOCATION]Basis\\";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
- ModuleID = gid_Module_Root;
- Name = "BASISINSTALLLOCATION";
- Value = "[INSTALLLOCATION]Basis\\";
- Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION);
-End
-
-RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
- ModuleID = gid_Module_Root;
- Name = "BASISINSTALLLOCATION";
- Value = "[INSTALLLOCATION]Basis\\";
- Styles = (ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
- ModuleID = gid_Module_Root;
- Name = "UREINSTALLLOCATION";
- Value = "[INSTALLLOCATION]URE\\";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
- ModuleID = gid_Module_Root;
- Name = "UREINSTALLLOCATION";
- Value = "[INSTALLLOCATION]URE\\";
- Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
-End
-
-RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
- ModuleID = gid_Module_Root;
- Name = "UREINSTALLLOCATION";
- Value = "[INSTALLLOCATION]URE\\";
- Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
-End
-
-RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
- ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
- Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
- ModuleID = gid_Module_Root;
- Name = "UREINSTALLLOCATION";
- Value = "[INSTALLLOCATION]URE\\";
- Styles = (ALWAYS_REQUIRED);
-End
+//RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Basisinstall
+// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
+// ModuleID = gid_Module_Root;
+// Name = "BASISINSTALLLOCATION";
+// Value = "[INSTALLLOCATION]Basis\\";
+// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
+//End
+
+//RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Basisinstall
+// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
+// ModuleID = gid_Module_Root;
+// Name = "BASISINSTALLLOCATION";
+// Value = "[INSTALLLOCATION]Basis\\";
+// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
+//End
+
+//RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Basisinstall
+// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+// Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\Basis\%OOOBASEVERSION";
+// ModuleID = gid_Module_Root;
+// Name = "BASISINSTALLLOCATION";
+// Value = "[INSTALLLOCATION]Basis\\";
+// Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_OOOBASEVERSION);
+//End
+
+//RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Basisinstall
+// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+// Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+// ModuleID = gid_Module_Root;
+// Name = "BASISINSTALLLOCATION";
+// Value = "[INSTALLLOCATION]Basis\\";
+// Styles = (ALWAYS_REQUIRED);
+//End
+
+//RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Productcode_Ureinstall
+// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%PRODUCTCODE";
+// ModuleID = gid_Module_Root;
+// Name = "UREINSTALLLOCATION";
+// Value = "[INSTALLLOCATION]URE\\";
+// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
+//End
+
+//RegistryItem gid_Regitem_Software_Manufacturer_Productname_Productversion_Upgradecode_Ureinstall
+// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+// Subkey = "Software\%MANUFACTURER\%PRODUCTNAME%PRODUCTADDON\%PRODUCTVERSION\%UPGRADECODE";
+// ModuleID = gid_Module_Root;
+// Name = "UREINSTALLLOCATION";
+// Value = "[INSTALLLOCATION]URE\\";
+// Styles = (LANGUAGEPACK,ALWAYS_REQUIRED);
+//End
+
+//RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Ureinstall
+// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+// Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\URE\%URELAYERVERSION";
+// ModuleID = gid_Module_Root;
+// Name = "UREINSTALLLOCATION";
+// Value = "[INSTALLLOCATION]URE\\";
+// Styles = (ALWAYS_REQUIRED,LAYER_REGISTRY,USE_URELAYERVERSION);
+//End
+
+//RegistryItem gid_Regitem_Software_OpenOfficeorg_Ooobaseversion_Layer_Ureinstall
+// ParentID = PREDEFINED_HKEY_LOCAL_MACHINE;
+// Subkey = "Software\OpenOffice\${REGISTRYLAYERNAME}\%PRODUCTNAME\%BRANDPACKAGEVERSION";
+// ModuleID = gid_Module_Root;
+// Name = "UREINSTALLLOCATION";
+// Value = "[INSTALLLOCATION]URE\\";
+// Styles = (ALWAYS_REQUIRED);
+//End
RegistryItem gid_Regitem_Sog
ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
Modified: openoffice/branches/rejuvenate01/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp (original)
+++ openoffice/branches/rejuvenate01/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp Fri Jul 19 15:59:04 2013
@@ -31,8 +31,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+ Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
@@ -54,8 +54,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+ Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
@@ -86,8 +86,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+ Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
@@ -118,8 +118,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_
ModuleID = gid_Module_Root;
Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
Styles = (X64); // Values: X64 / X64_ONLY
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt_x64.dll";
+ Value = "[INSTALLLOCATION]program\shlxthdl\ooofilt.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
End
RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
@@ -159,8 +159,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+ Value = "[INSTALLLOCATION]program\shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
@@ -193,8 +193,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_
ComponentCondition = "VersionNT >= 600";
Styles = (X64);
Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl_x64.dll";
+ Value = "[INSTALLLOCATION]program\shlxthdl\propertyhdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
Modified: openoffice/branches/rejuvenate01/main/scripting/source/pyprov/pythonscript.py
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/scripting/source/pyprov/pythonscript.py?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/scripting/source/pyprov/pythonscript.py (original)
+++ openoffice/branches/rejuvenate01/main/scripting/source/pyprov/pythonscript.py Fri Jul 19 15:59:04 2013
@@ -34,16 +34,24 @@ except NameError:
unicode = str
class LogLevel:
- NONE = 0
- ERROR = 1
- DEBUG = 2
+ NONE = 0 # production level
+ ERROR = 1 # for script developers
+ DEBUG = 2 # for script framework developers
+
+PYSCRIPT_LOG_ENV = "PYSCRIPT_LOG_LEVEL"
+PYSCRIPT_LOG_STDOUT_ENV = "PYSCRIPT_LOG_STDOUT"
# Configuration ----------------------------------------------------
-LogLevel.use = LogLevel.NONE # production level
-#LogLevel.use = LogLevel.ERROR # for script developers
-#LogLevel.use = LogLevel.DEBUG # for script framework developers
-LOG_STDOUT = True # True, writes to stdout (difficult on windows)
- # False, writes to user/Scripts/python/log.txt
+LogLevel.use = LogLevel.NONE
+if os.environ.get(PYSCRIPT_LOG_ENV) == "ERROR":
+ LogLevel.use = LogLevel.ERROR
+elif os.environ.get(PYSCRIPT_LOG_ENV) == "DEBUG":
+ LogLevel.use = LogLevel.DEBUG
+
+# True, writes to stdout (difficult on windows)
+# False, writes to user/Scripts/python/log.txt
+LOG_STDOUT = os.environ.get(PYSCRIPT_LOG_STDOUT_ENV, "1") != "0"
+
ENABLE_EDIT_DIALOG=False # offers a minimal editor for editing.
#-------------------------------------------------------------------
Modified: openoffice/branches/rejuvenate01/main/sd/inc/app.hrc
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/inc/app.hrc?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/inc/app.hrc (original)
+++ openoffice/branches/rejuvenate01/main/sd/inc/app.hrc Fri Jul 19 15:59:04 2013
@@ -487,7 +487,7 @@
#define SID_TP_USE_FOR_NEW_PRESENTATIONS (SID_SD_START+427)
#define SID_TP_SHOW_LARGE_PREVIEW (SID_SD_START+428)
#define SID_TP_SHOW_SMALL_PREVIEW (SID_SD_START+429)
-#define SID_SHOW_TOOL_PANEL (SID_SD_START+430)
+// SID_SD_START+430 is unused
#define SID_INSERT_MASTER_PAGE (SID_SD_START+431)
#define SID_DELETE_MASTER_PAGE (SID_SD_START+432)
#define SID_RENAME_MASTER_PAGE (SID_SD_START+433)
Modified: openoffice/branches/rejuvenate01/main/sd/sdi/ViewShellBase.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/sdi/ViewShellBase.sdi?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/sdi/ViewShellBase.sdi (original)
+++ openoffice/branches/rejuvenate01/main/sd/sdi/ViewShellBase.sdi Fri Jul 19 15:59:04 2013
@@ -82,11 +82,6 @@ interface ViewShellBaseView
ExecMethod = Execute;
StateMethod = GetState;
]
- SID_SHOW_TOOL_PANEL
- [
- ExecMethod = Execute;
- StateMethod = GetState;
- ]
SID_WIN_FULLSCREEN
[
ExecMethod = Execute;
Modified: openoffice/branches/rejuvenate01/main/sd/sdi/sdraw.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/sdi/sdraw.sdi?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/sdi/sdraw.sdi (original)
+++ openoffice/branches/rejuvenate01/main/sd/sdi/sdraw.sdi Fri Jul 19 15:59:04 2013
@@ -7366,30 +7366,3 @@ SfxBoolItem SlideSorterMultiPaneGUI SID_
ToolBoxConfig = TRUE,
GroupId = GID_MODIFY;
]
-
-SfxVoidItem TaskPaneShowPanel SID_SHOW_TOOL_PANEL (
- SfxBoolItem IsPanelVisible ID_VAL_ISVISIBLE,
- SfxUInt32Item PanelId ID_VAL_PANEL_INDEX)
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = TRUE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = FALSE,
- GroupId = GID_VIEW;
-]
-
-
Modified: openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc3.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc3.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc3.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/core/drawdoc3.cxx Fri Jul 19 15:59:04 2013
@@ -1512,6 +1512,58 @@ void SdDrawDocument::RemoveUnnecessaryMa
|* Ist rLayoutName leer, so wird die erste MasterPage genommen
\************************************************************************/
+// #121863# factored out functionality
+bool isMasterPageLayoutNameUnique(const SdDrawDocument& rDoc, const String& rCandidate)
+{
+ if(!rCandidate.Len())
+ {
+ return false;
+ }
+
+ const sal_uInt16 nPageCount(rDoc.GetMasterPageCount());
+
+ for(sal_uInt16 a(0); a < nPageCount; a++)
+ {
+ const SdrPage* pCandidate = rDoc.GetMasterPage(a);
+ String aPageLayoutName(pCandidate->GetLayoutName());
+ aPageLayoutName.Erase(aPageLayoutName.SearchAscii(SD_LT_SEPARATOR));
+
+ if(aPageLayoutName == rCandidate)
+ {
+ return false;
+ }
+ }
+
+ return true;
+}
+
+// #121863# factored out functinality
+String createNewMasterPageLayoutName(const SdDrawDocument& rDoc)
+{
+ const String aBaseName(SdResId(STR_LAYOUT_DEFAULT_NAME));
+ String aRetval;
+ sal_uInt16 nCount(0);
+
+ while(!aRetval.Len())
+ {
+ aRetval = aBaseName;
+
+ if(nCount)
+ {
+ aRetval += String::CreateFromInt32(nCount);
+ }
+
+ nCount++;
+
+ if(!isMasterPageLayoutNameUnique(rDoc, aRetval))
+ {
+ aRetval.Erase();
+ }
+ }
+
+ return aRetval;
+}
+
void SdDrawDocument::SetMasterPage(sal_uInt16 nSdPageNum,
const String& rLayoutName,
SdDrawDocument* pSourceDoc,
@@ -1541,8 +1593,6 @@ void SdDrawDocument::SetMasterPage(sal_u
String aOldLayoutName(aOldPageLayoutName);
aOldLayoutName.Erase(aOldLayoutName.SearchAscii( SD_LT_SEPARATOR ));
- String aNewLayoutName( rLayoutName );
-
if (pSourceDoc)
{
List* pReplList = NULL;
@@ -1556,7 +1606,6 @@ void SdDrawDocument::SetMasterPage(sal_u
// No LayoutName: take first MasterPage
pMaster = (SdPage*) pSourceDoc->GetMasterSdPage(0, PK_STANDARD);
pNotesMaster = (SdPage*) pSourceDoc->GetMasterSdPage(0, PK_NOTES);
- aNewLayoutName = pMaster->GetName();
}
else
{
@@ -1587,7 +1636,6 @@ void SdDrawDocument::SetMasterPage(sal_u
// so take the first MasterPage
pMaster = (SdPage*) pSourceDoc->GetMasterSdPage(0, PK_STANDARD);
pNotesMaster = (SdPage*) pSourceDoc->GetMasterSdPage(0, PK_NOTES);
- aNewLayoutName = pMaster->GetName();
}
}
@@ -1604,13 +1652,53 @@ void SdDrawDocument::SetMasterPage(sal_u
return;
}
- if (pSourceDoc != this)
- {
+ const String aOriginalNewLayoutName( pMaster->GetName() );
+ String aTargetNewLayoutName(aOriginalNewLayoutName);
+
+ if (pSourceDoc != this)
+ {
+ // #121863# clone masterpages, they are from another model (!)
+ SdPage* pNewNotesMaster = dynamic_cast< SdPage* >(pNotesMaster->Clone(this));
+ SdPage* pNewMaster = dynamic_cast< SdPage* >(pMaster->Clone(this));
+
+ if(!pNewNotesMaster || !pNewMaster)
+ {
+ delete pNewNotesMaster;
+ delete pNewMaster;
+ OSL_ASSERT("SdDrawDocument::SetMasterPage() cloning of MasterPage/NoteAmsterPage failed!" );
+ return;
+ }
+
+ pNotesMaster = pNewNotesMaster;
+ pMaster = pNewMaster;
+
+ // layout name needs to be unique
+ aTargetNewLayoutName = pMaster->GetLayoutName();
+ aTargetNewLayoutName.Erase(aTargetNewLayoutName.SearchAscii(SD_LT_SEPARATOR));
+
+ if(!isMasterPageLayoutNameUnique(*this, aTargetNewLayoutName))
+ {
+ aTargetNewLayoutName = createNewMasterPageLayoutName(*this);
+
+ String aTemp(aTargetNewLayoutName);
+ aTemp.AppendAscii(RTL_CONSTASCII_STRINGPARAM(SD_LT_SEPARATOR));
+ aTemp.Append(String(SdResId(STR_LAYOUT_OUTLINE)));
+
+ pMaster->SetName(aTargetNewLayoutName);
+ pMaster->SetLayoutName(aTemp);
+
+ pNotesMaster->SetName(aTargetNewLayoutName);
+ pNotesMaster->SetLayoutName(aTemp);
+ }
+ }
+
+ if (pSourceDoc != this)
+ {
const sal_uInt16 nMasterPageCount = GetMasterPageCount();
for ( sal_uInt16 nMPage = 0; nMPage < nMasterPageCount; nMPage++ )
{
SdPage* pCheckMaster = (SdPage*)GetMasterPage(nMPage);
- if( pCheckMaster->GetName() == aNewLayoutName )
+ if( pCheckMaster->GetName() == aTargetNewLayoutName )
{
bLayoutReloaded = sal_True;
break;
@@ -1635,9 +1723,19 @@ void SdDrawDocument::SetMasterPage(sal_u
{
aName = pHisSheet->GetName();
- if( aName.Search( aNewLayoutName ) == 0 )
+ // #121863# search in source styles with original style name from source of
+ // evtl. cloned master (not-cloned, renamed for uniqueness)
+ if( aName.Search( aOriginalNewLayoutName ) == 0 )
{
- SfxStyleSheet* pMySheet = static_cast<SfxStyleSheet*>( mxStyleSheetPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE) );
+ // #121863# build name of evtl. cloned master style to search for
+ if(aOriginalNewLayoutName != aTargetNewLayoutName)
+ {
+ const sal_uInt16 nPos(aName.SearchAscii(SD_LT_SEPARATOR));
+ aName.Erase(0, nPos);
+ aName.Insert(aTargetNewLayoutName, 0);
+ }
+
+ SfxStyleSheet* pMySheet = static_cast<SfxStyleSheet*>( mxStyleSheetPool->Find(aName, SD_STYLE_FAMILY_MASTERPAGE) );
if (pMySheet)
{
@@ -1672,11 +1770,14 @@ void SdDrawDocument::SetMasterPage(sal_u
pReplData->nFamily = pMySheet->GetFamily();
pReplData->aNewName = pMySheet->GetName();
+ // #121863# re-create original name of styte used at page where to replace with
+ // this new style
String aTemp(pMySheet->GetName());
- sal_uInt16 nPos = aTemp.SearchAscii( SD_LT_SEPARATOR );
+ const sal_uInt16 nPos(aTemp.SearchAscii(SD_LT_SEPARATOR));
aTemp.Erase(0, nPos);
aTemp.Insert(aOldLayoutName, 0);
- pReplData->aName = aTemp;
+
+ pReplData->aName = aTemp;
pReplList->Insert(pReplData, LIST_APPEND);
}
@@ -1738,13 +1839,16 @@ void SdDrawDocument::SetMasterPage(sal_u
String aLayoutName = aPageLayoutName;
aLayoutName.Erase( aLayoutName.SearchAscii( SD_LT_SEPARATOR ));
- if (pSourceDoc != this)
- {
- // Aus dem Source-Dokument austragen
- SdrPage* pTest = NULL;
- pTest = pSourceDoc->RemoveMasterPage(pNotesMaster->GetPageNum());
- pTest = pSourceDoc->RemoveMasterPage(pMaster->GetPageNum());
- }
+ // #121863# Do *not* remove from original document any longer, it is potentially used there
+ // and would lead to crashes. Rely on the automatic process of removing unused masterpages
+ // (see RemoveUnnecessaryMasterPages)
+ //if (pSourceDoc != this)
+ //{
+ // // Aus dem Source-Dokument austragen
+ // SdrPage* pTest = NULL;
+ // pTest = pSourceDoc->RemoveMasterPage(pNotesMaster->GetPageNum());
+ // pTest = pSourceDoc->RemoveMasterPage(pMaster->GetPageNum());
+ //}
/*********************************************************************
|* Neue MasterPages ins Dokument eintragen und den Standard- und
@@ -1884,32 +1988,7 @@ void SdDrawDocument::SetMasterPage(sal_u
/*********************************************************************
|* Einen neuen Layoutnamen ausdenken
\********************************************************************/
- String aName = String(SdResId(STR_LAYOUT_DEFAULT_NAME));
- String aTest;
- sal_Bool bNotANewName = sal_True;
- sal_uInt16 nCount = 0;
- sal_uInt16 nMPgCount = GetMasterPageCount();
-
- for (nCount = 0; bNotANewName; nCount++)
- {
- // Testnamen bilden
- aTest = aName; // Standard, Standard1, Standard2, ...
- if (nCount > 0)
- aTest += String::CreateFromInt32( nCount );
-
- // gibt's schon eine, die so heisst?
- bNotANewName = sal_False;
- for (sal_uInt16 nMPg = 1; nMPg < nMPgCount; nMPg++)
- {
- const SdrPage* pTest = GetMasterPage(nMPg);
- String aPageLayoutName(pTest->GetLayoutName());
- aPageLayoutName.Erase( aPageLayoutName.SearchAscii( SD_LT_SEPARATOR ));
-
- if (aPageLayoutName == aTest)
- bNotANewName = sal_True;
- }
- }
- aName = aTest;
+ String aName(createNewMasterPageLayoutName(*this));
String aPageLayoutName(aName);
aPageLayoutName.AppendAscii( RTL_CONSTASCII_STRINGPARAM( SD_LT_SEPARATOR ));
aPageLayoutName += String(SdResId(STR_LAYOUT_OUTLINE));
Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/app/sdmod1.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/app/sdmod1.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/app/sdmod1.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/app/sdmod1.cxx Fri Jul 19 15:59:04 2013
@@ -746,17 +746,6 @@ SfxFrame* SdModule::ExecuteNewDocument(
}
}
}
-
- if (bMakeLayoutVisible && pViewFrame!=NULL)
- {
- // Make the layout menu visible in the tool pane.
- ::sd::ViewShellBase* pBase = ::sd::ViewShellBase::GetViewShellBase(pViewFrame);
- if (pBase != NULL)
- {
- FrameworkHelper::Instance(*pBase)->RequestSidebarPanel(
- FrameworkHelper::msLayoutTaskPanelURL);
- }
- }
}
return pFrame;
Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/framework/tools/FrameworkHelper.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/framework/tools/FrameworkHelper.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/framework/tools/FrameworkHelper.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/framework/tools/FrameworkHelper.cxx Fri Jul 19 15:59:04 2013
@@ -637,57 +637,6 @@ Reference<XResourceId> FrameworkHelper::
-Reference<XResourceId> FrameworkHelper::RequestSidebarPanel (
- const OUString& rsTaskPanelURL,
- const bool bEnsureTaskPaneIsVisible)
-{
- try
- {
- if (mxConfigurationController.is())
- {
- // Check the existence of the task pane.
- if ( ! bEnsureTaskPaneIsVisible)
- {
- Reference<XConfiguration> xConfiguration (
- mxConfigurationController->getCurrentConfiguration());
- if (xConfiguration.is())
- if ( ! xConfiguration->hasResource(
- CreateResourceId(msSidebarViewURL, msSidebarPaneURL)))
- {
- // Task pane is not active. Do not force it.
- return NULL;
- }
- }
-
- // Create the resource id from URLs for the sidebar pane
- // and view and the requested panel.
- mxConfigurationController->requestResourceActivation(
- CreateResourceId(msSidebarPaneURL),
- ResourceActivationMode_ADD);
- mxConfigurationController->requestResourceActivation(
- CreateResourceId(msSidebarViewURL, msSidebarPaneURL),
- ResourceActivationMode_REPLACE);
- Reference<XResourceId> xPanelId (CreateResourceId(rsTaskPanelURL, msSidebarViewURL, msSidebarPaneURL));
- mxConfigurationController->requestResourceActivation(
- xPanelId,
- ResourceActivationMode_REPLACE);
-
- return xPanelId;
- }
- }
- catch (lang::DisposedException&)
- {
- Dispose();
- }
- catch (RuntimeException&)
- {}
-
- return NULL;
-}
-
-
-
-
void FrameworkHelper::RequestResourceDeactivation (const cssu::Reference<cssdf::XResourceId>& rxResourceId)
{
try
Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/inc/framework/FrameworkHelper.hxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/inc/framework/FrameworkHelper.hxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/inc/framework/FrameworkHelper.hxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/inc/framework/FrameworkHelper.hxx Fri Jul 19 15:59:04 2013
@@ -229,25 +229,6 @@ public:
const ::rtl::OUString& rsResourceURL,
const ::rtl::OUString& rsAnchorURL);
- /** Request the activation of the specified panel in the
- sidebar.
- @param rsSidebarPanelURL
- The panel that is to be activated.
- @param bEnsurePaneIsVisible
- When this is <TRUE/> then the sidebar pane is activated when not
- yet active.
- When this flag is <FALSE/> then the requested panel
- is activated only when the task pane is already active. When it
- is not active then this call is silently ignored.
- @return
- The resource id of the requested sidebar panel is returned. With that
- the caller can, for example, call RunOnResourceActivation() to
- do some initialization after the requested view becomes active.
- */
- cssu::Reference<cssdf::XResourceId> RequestSidebarPanel (
- const ::rtl::OUString& rsSidebarPanelURL,
- const bool bEnsureTaskPaneIsVisible = true);
-
/** Request the deactivation of the specified resource.
*/
void RequestResourceDeactivation (
Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx Fri Jul 19 15:59:04 2013
@@ -262,7 +262,11 @@ void PageSelector::CheckConsistency (voi
}
if (nSelectionCount!=mnSelectedPageCount)
{
- assert(nSelectionCount==mnSelectedPageCount);
+ // #120020# The former call to assert(..) internally calls
+ // SlideSorterModel::GetPageDescriptor which will crash in this situation
+ // (only in non-pro code). All what is wanted there is to assert it (the
+ // error is already detected), so do this directly.
+ OSL_ENSURE(false, "PageSelector: Consistency error (!)");
}
}
Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx Fri Jul 19 15:59:04 2013
@@ -76,6 +76,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
+#include <sfx2/sidebar/Sidebar.hxx>
#include <svx/svxids.hrc>
#include <svx/zoomitem.hxx>
#include <svx/svxdlg.hxx>
@@ -187,12 +188,10 @@ void SlotManager::FuTemporary (SfxReques
case SID_SLIDE_TRANSITIONS_PANEL:
{
- // Make the slide transition panel visible (expand it)
- // in the tool pane.
- if (mrSlideSorter.GetViewShellBase() != NULL)
- framework::FrameworkHelper::Instance(*mrSlideSorter.GetViewShellBase())
- ->RequestSidebarPanel(
- sd::framework::FrameworkHelper::msSlideTransitionTaskPanelURL);
+ // Make the slide transition panel visible in the sidebar.
+ ::sfx2::sidebar::Sidebar::ShowPanel(
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SlideTransitionPanel")),
+ pShell->GetViewFrame()->GetFrame().GetFrameInterface());
rRequest.Ignore ();
break;
}
Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx Fri Jul 19 15:59:04 2013
@@ -567,6 +567,7 @@ void SlideSorterViewShell::Activate (sal
case ViewShell::ST_IMPRESS:
case ViewShell::ST_SLIDE_SORTER:
case ViewShell::ST_NOTES:
+ case ViewShell::ST_DRAW:
eContext = EnumContext::Context_DrawPage;
if (pMainViewShell->ISA(DrawViewShell))
{
Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/table/tablefunction.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/table/tablefunction.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/table/tablefunction.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/table/tablefunction.cxx Fri Jul 19 15:59:04 2013
@@ -55,6 +55,7 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/request.hxx>
+#include <sfx2/sidebar/Sidebar.hxx>
#include <svl/style.hxx>
#include "framework/FrameworkHelper.hxx"
@@ -204,10 +205,11 @@ SfxViewShell* pViewShell = GetViewShell(
}
else
{
- // Make the slide transition panel visible (expand it) in the
- // tool pane.
- framework::FrameworkHelper::Instance(GetViewShellBase())->RequestSidebarPanel(
- framework::FrameworkHelper::msTableDesignPanelURL);
+ // Make the table design panel visible (expand it) in the
+ // sidebar.
+ ::sfx2::sidebar::Sidebar::ShowPanel(
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImpressTableDesignPanel")),
+ GetViewFrame()->GetFrame().GetFrameInterface());
}
Cancel();
Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/view/GraphicViewShellBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/view/GraphicViewShellBase.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/view/GraphicViewShellBase.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/view/GraphicViewShellBase.cxx Fri Jul 19 15:59:04 2013
@@ -96,7 +96,6 @@ void GraphicViewShellBase::Execute (SfxR
case SID_OUTLINEMODE:
case SID_NOTESMODE:
case SID_HANDOUTMODE:
- case SID_SHOW_TOOL_PANEL:
// Prevent some Impress-only slots from being executed.
rRequest.Cancel();
break;
Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/view/ViewShellBase.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/view/ViewShellBase.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/view/ViewShellBase.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/view/ViewShellBase.cxx Fri Jul 19 15:59:04 2013
@@ -198,7 +198,6 @@ public:
void GetSlotState (SfxItemSet& rSet);
void ProcessRestoreEditingViewSlot (void);
- void ProcessTaskPaneSlot (SfxRequest& rRequest);
private:
ViewShellBase& mrBase;
@@ -743,10 +742,6 @@ void ViewShellBase::Execute (SfxRequest&
// The full screen mode is not supported. Ignore the request.
break;
- case SID_SHOW_TOOL_PANEL:
- mpImpl->ProcessTaskPaneSlot(rRequest);
- break;
-
case SID_RESTORE_EDITING_VIEW:
mpImpl->ProcessRestoreEditingViewSlot();
break;
@@ -1535,51 +1530,6 @@ void ViewShellBase::Implementation::GetS
-
-void ViewShellBase::Implementation::ProcessTaskPaneSlot (SfxRequest& rRequest)
-{
- // Set the visibility state of the toolpanel and one of its top
- // level panels.
- sal_Bool bShowToolPanel = sal_True;
- sidebar::PanelId nPanelId (sidebar::PID_UNKNOWN);
- bool bPanelIdGiven = false;
-
- // Extract the given arguments.
- const SfxItemSet* pArgs = rRequest.GetArgs();
- if (pArgs)
- {
- if ((pArgs->Count() == 1) || (pArgs->Count() == 2))
- {
- SFX_REQUEST_ARG (rRequest, pIsPanelVisible,
- SfxBoolItem, ID_VAL_ISVISIBLE, sal_False);
- if (pIsPanelVisible != NULL)
- bShowToolPanel = pIsPanelVisible->GetValue();
- }
- if (pArgs->Count() == 2)
- {
- SFX_REQUEST_ARG (rRequest, pPanelId, SfxUInt32Item,
- ID_VAL_PANEL_INDEX, sal_False);
- if (pPanelId != NULL)
- {
- nPanelId = static_cast<sidebar::PanelId>(pPanelId->GetValue());
- bPanelIdGiven = true;
- }
- }
- }
-
- // Ignore the request for some combinations of panels and view
- // shell types.
- if (bPanelIdGiven
- && ! (nPanelId==sidebar::PID_LAYOUT
- && mrBase.GetMainViewShell()!=NULL
- && mrBase.GetMainViewShell()->GetShellType()==ViewShell::ST_OUTLINE))
- {
- framework::FrameworkHelper::Instance(mrBase)->RequestSidebarPanel(
- framework::FrameworkHelper::msLayoutTaskPanelURL);
- }
-}
-
-
} // end of namespace sd
Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/view/ViewShellImplementation.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/view/ViewShellImplementation.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/view/ViewShellImplementation.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/view/ViewShellImplementation.cxx Fri Jul 19 15:59:04 2013
@@ -53,6 +53,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/request.hxx>
+#include <sfx2/sidebar/Sidebar.hxx>
#include <svl/aeitem.hxx>
#include <svx/imapdlg.hxx>
#include <vcl/msgbox.hxx>
@@ -147,27 +148,9 @@ void ViewShell::Implementation::ProcessM
}
// Make the layout menu visible in the tool pane.
- SfxBoolItem aMakeToolPaneVisible (ID_VAL_ISVISIBLE, sal_True);
- SfxUInt32Item aPanelId (ID_VAL_PANEL_INDEX, sidebar::PID_LAYOUT);
- SfxViewFrame* pFrame = mrViewShell.GetViewFrame();
- if (pFrame!=NULL && pFrame->GetDispatcher()!=NULL)
- {
- pFrame->GetDispatcher()->Execute (
- SID_SHOW_TOOL_PANEL,
- SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD,
- &aMakeToolPaneVisible,
- &aPanelId,
- NULL);
- }
- else
- {
- DBG_ASSERT(pFrame!=NULL && pFrame->GetDispatcher()!=NULL,
- "ViewShell::Implementation::ProcessModifyPageSlot(): can not get dispatcher");
- }
-
- // We have activated a non-modal control in the task pane.
- // Because it does not return anything we can not do anything
- // more right now and have to exit here.
+ sfx2::sidebar::Sidebar::ShowPanel(
+ rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImpressLayoutsPanel")),
+ mrViewShell.GetViewFrame()->GetFrame().GetFrameInterface());
break;
}
else if (pArgs->Count() == 4)
Modified: openoffice/branches/rejuvenate01/main/sd/source/ui/view/drviews6.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sd/source/ui/view/drviews6.cxx?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sd/source/ui/view/drviews6.cxx (original)
+++ openoffice/branches/rejuvenate01/main/sd/source/ui/view/drviews6.cxx Fri Jul 19 15:59:04 2013
@@ -78,6 +78,12 @@
#include "DrawDocShell.hxx"
#include "framework/FrameworkHelper.hxx"
#include <svx/svdoashp.hxx>
+#include <sfx2/sidebar/Sidebar.hxx>
+
+namespace {
+ static const ::rtl::OUString CustomAnimationPanelId (RTL_CONSTASCII_USTRINGPARAM("CustomAnimationPanel"));
+ static const ::rtl::OUString SlideTransitionPanelId (RTL_CONSTASCII_USTRINGPARAM("SlideTransitionPanel"));
+}
namespace sd {
@@ -574,10 +580,10 @@ void DrawViewShell::FuTemp04(SfxRequest&
case SID_CUSTOM_ANIMATION_PANEL:
{
- // Make the slide transition panel visible (expand it) in the
- // tool pane.
- framework::FrameworkHelper::Instance(GetViewShellBase())->RequestSidebarPanel(
- framework::FrameworkHelper::msCustomAnimationTaskPanelURL);
+ // Make the slide transition panel visible in the sidebar.
+ ::sfx2::sidebar::Sidebar::ShowPanel(
+ CustomAnimationPanelId,
+ GetViewFrame()->GetFrame().GetFrameInterface());
Cancel();
rReq.Done ();
@@ -586,10 +592,10 @@ void DrawViewShell::FuTemp04(SfxRequest&
case SID_SLIDE_TRANSITIONS_PANEL:
{
- // Make the slide transition panel visible (expand it) in the
- // tool pane.
- framework::FrameworkHelper::Instance(GetViewShellBase())->RequestSidebarPanel(
- framework::FrameworkHelper::msSlideTransitionTaskPanelURL);
+ // Make the slide transition panel visible in the sidebar.
+ ::sfx2::sidebar::Sidebar::ShowPanel(
+ SlideTransitionPanelId,
+ GetViewFrame()->GetFrame().GetFrameInterface());
Cancel();
rReq.Done ();
Modified: openoffice/branches/rejuvenate01/main/sdext/source/pdfimport/xpdftest/makefile.mk
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/sdext/source/pdfimport/xpdftest/makefile.mk?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
--- openoffice/branches/rejuvenate01/main/sdext/source/pdfimport/xpdftest/makefile.mk (original)
+++ openoffice/branches/rejuvenate01/main/sdext/source/pdfimport/xpdftest/makefile.mk Fri Jul 19 15:59:04 2013
@@ -40,7 +40,7 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : target.mk
-#ALLTAR : $(MISC)$/test_0_succeeded $(MISC)$/test_1_succeeded
+#ALLTAR : $(MISC)$/test_0_succeeded
$(MISC)$/test_0_succeeded: $(BIN)$/xpdfimport$(EXECPOST) binary_0_out.def text_0_out.def testinput.pdf
$(BIN)$/xpdfimport -f $(MISC)$/binary_0_out testinput.pdf > $(MISC)$/text_0_out
@@ -48,8 +48,18 @@ $(MISC)$/test_0_succeeded: $(BIN)$/xpdfi
diff --strip-trailing-cr $(MISC)$/text_0_out text_0_out.def
$(TOUCH) $@
-$(MISC)$/test_1_succeeded: $(BIN)$/xpdfimport$(EXECPOST) binary_1_out.def text_1_out.def book.pdf
- $(BIN)$/xpdfimport -f $(MISC)$/binary_1_out book.pdf > $(MISC)$/text_1_out
- diff --strip-trailing-cr $(MISC)$/binary_1_out binary_1_out.def
- diff --strip-trailing-cr $(MISC)$/text_1_out text_1_out.def
- $(TOUCH) $@
+# This test is disabled because
+# - the PDF import extension is not part of the AOO build #i118592#
+# - the test files are too huge (75MB + 5MB + 500kB) to remain in the tree
+# The test files are still available at
+# http://svn.apache.org/repos/asf/!svn/bc/1500000/openoffice/tags/AOO341/main/sdext/source/pdfimport/xpdftest/binary_1_out.def
+# http://svn.apache.org/repos/asf/!svn/bc/1500000/openoffice/tags/AOO341/main/sdext/source/pdfimport/xpdftest/text_1_out.def
+# http://svn.apache.org/repos/asf/!svn/bc/1500000/openoffice/tags/AOO341/main/sdext/source/pdfimport/xpdftest/book.pdf
+# if you download them you can enable the test below:
+
+#$(MISC)$/test_1_succeeded: $(BIN)$/xpdfimport$(EXECPOST) binary_1_out.def text_1_out.def book.pdf
+# $(BIN)$/xpdfimport -f $(MISC)$/binary_1_out book.pdf > $(MISC)$/text_1_out
+# diff --strip-trailing-cr $(MISC)$/binary_1_out binary_1_out.def
+# diff --strip-trailing-cr $(MISC)$/text_1_out text_1_out.def
+# $(TOUCH) $@
+
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/DS_Store
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/DS_Store?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/DS_Store_Dev
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/DS_Store_Dev?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.
Modified: openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/osxdndinstall.png
URL: http://svn.apache.org/viewvc/openoffice/branches/rejuvenate01/main/setup_native/source/mac/ooo/osxdndinstall.png?rev=1504925&r1=1504924&r2=1504925&view=diff
==============================================================================
Binary files - no diff available.