[Libreoffice-commits] .: 34 commits - sd/source
Jan Holesovsky
kendy at kemper.freedesktop.org
Fri May 27 12:16:42 PDT 2011
sd/source/filter/xml/sdxmlwrp.cxx | 21 ++++++++++++++++-----
sd/source/ui/app/res_bmp.src | 13 +++++++++++++
sd/source/ui/unoidl/unomodel.cxx | 7 ++++++-
sd/source/ui/view/drviews6.cxx | 6 +++++-
sd/source/ui/view/sdview3.cxx | 3 ++-
5 files changed, 42 insertions(+), 8 deletions(-)
New commits:
commit 9fda77e351cf0bb5c7b99d0cc44171d995c52e78
Merge: 1d35200... ec87332...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri May 27 20:49:43 2011 +0200
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/impress
commit 1d35200a3f4e8cd95116fcbce8a0d6b797d10745
Merge: f214507... 2de3935...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri May 27 20:45:56 2011 +0200
Merge remote-tracking branch 'origin/integration/dev300_m106'
Conflicts:
slideshow/source/engine/makefile.mk
commit 2de3935c002b62bfbc7d6418e109ab0d400d15f3
Merge: 6e67c81... a448845...
Author: Jan Holesovsky <kendy at suse.cz>
Date: Fri Apr 22 15:08:18 2011 +0200
Merge commit 'ooo/DEV300_m106' into libreoffice-3-4
Conflicts:
sd/source/ui/app/res_bmp.src
diff --cc sd/source/filter/xml/sdxmlwrp.cxx
index 4ffaba4,c40480a..1d0e1de
mode 100644,100755..100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
diff --cc sd/source/ui/app/res_bmp.src
index e3d3a2f,da66482..f38f317
mode 100644,100755..100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
diff --cc sd/source/ui/unoidl/unomodel.cxx
index 78eb0d8,a163046..c58b5da
mode 100644,100755..100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@@ -2073,13 -2111,18 +2073,18 @@@ void SAL_CALL SdXImpressDocument::rende
{
sal_Int32 nPage = ImplPDFGetBookmarkPage( aIBeg->aBookmark, *mpDoc );
if ( nPage != -1 )
- pPDFExtOutDevData->SetLinkDest( aIBeg->nLinkId, pPDFExtOutDevData->CreateDest( aPageRect, nPage, vcl::PDFWriter::FitRectangle ) );
+ {
+ if ( aIBeg->nLinkId != -1 )
+ pPDFExtOutDevData->SetLinkDest( aIBeg->nLinkId, pPDFExtOutDevData->CreateDest( aPageRect, nPage, vcl::PDFWriter::FitRectangle ) );
+ else
+ pPDFExtOutDevData->DescribeRegisteredDest( aIBeg->nDestId, aPageRect, nPage, vcl::PDFWriter::FitRectangle );
+ }
else
pPDFExtOutDevData->SetLinkURL( aIBeg->nLinkId, aIBeg->aBookmark );
- aIBeg++;
+ ++aIBeg;
}
rBookmarks.clear();
- //---> i56629, i40318
+ //---> #i56629, #i40318
//get the page name, will be used as outline element in PDF bookmark pane
String aPageName = mpDoc->GetSdPage( (sal_uInt16)nPageNumber - 1 , PK_STANDARD )->GetName();
if( aPageName.Len() > 0 )
diff --cc sd/source/ui/view/drviews6.cxx
index 68abca3,0664d57..231fc32
mode 100644,100755..100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@@ -428,8 -449,12 +428,12 @@@ void DrawViewShell::GetBmpMaskState( Sf
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
// valid graphic object?
- if( pObj && pObj->ISA( SdrGrafObj ) && !( (SdrGrafObj*) pObj )->IsEPS() && !mpDrawView->IsTextEdit() )
- if( pObj && pObj->ISA( SdrGrafObj ) &&
++ if( pObj && pObj->ISA( SdrGrafObj ) &&
+ !( ((SdrGrafObj*) pObj)->IsEPS() || ((SdrGrafObj*) pObj)->IsRenderGraphic() ) &&
+ !mpDrawView->IsTextEdit() )
+ {
bEnable = sal_True;
+ }
// put value
rSet.Put( SfxBoolItem( SID_BMPMASK_EXEC, bEnable ) );
diff --cc sd/source/ui/view/sdview3.cxx
index 1e0cffe,8670759..875e865
mode 100644,100755..100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
commit 6e67c8168b01a255ac8b7b7f4edaace09739fb53
Author: Petr Mladek <pmladek at suse.cz>
Date: Tue Apr 19 18:58:51 2011 +0200
Version 3.3.99.2, tag libreoffice-3.3.99.2 (3.4.0-beta2)
commit 389ab0aee390bc5532e9e1ba5b4f2035ac7d6d5e
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Apr 14 14:16:39 2011 +0100
fix accessibility crash
two different callbacks connected to the same destination where
that destination unset the callback id of one of the callbacks
(cherry picked from commit 0929504217c225358388c911d3f81d7626c7776c)
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
index 9efd94a..15e65d7 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx
@@ -94,6 +94,7 @@ public:
DECL_LINK(SelectionChangeListener, void*);
DECL_LINK(BroadcastSelectionChange, void*);
DECL_LINK(FocusChangeListener, void*);
+ DECL_LINK(VisibilityChangeListener, void*);
DECL_LINK(UpdateChildrenCallback, void*);
private:
@@ -970,7 +971,7 @@ void AccessibleSlideSorterView::Implementation::ConnectListeners (void)
mrSlideSorter.GetController().GetFocusManager().AddFocusChangeListener(
LINK(this,AccessibleSlideSorterView::Implementation,FocusChangeListener));
mrSlideSorter.GetView().AddVisibilityChangeListener(
- LINK(this,AccessibleSlideSorterView::Implementation,UpdateChildrenCallback));
+ LINK(this,AccessibleSlideSorterView::Implementation,VisibilityChangeListener));
}
@@ -983,7 +984,7 @@ void AccessibleSlideSorterView::Implementation::ReleaseListeners (void)
mrSlideSorter.GetController().GetSelectionManager()->RemoveSelectionChangeListener(
LINK(this,AccessibleSlideSorterView::Implementation,SelectionChangeListener));
mrSlideSorter.GetView().RemoveVisibilityChangeListener(
- LINK(this,AccessibleSlideSorterView::Implementation,UpdateChildrenCallback));
+ LINK(this,AccessibleSlideSorterView::Implementation,VisibilityChangeListener));
if (mpWindow != NULL)
mpWindow->RemoveEventListener(
@@ -1132,6 +1133,15 @@ IMPL_LINK(AccessibleSlideSorterView::Implementation, UpdateChildrenCallback, voi
+IMPL_LINK(AccessibleSlideSorterView::Implementation, VisibilityChangeListener, void*, EMPTYARG )
+{
+ UpdateChildren();
+ return 1;
+}
+
+
+
+
} // end of namespace ::accessibility
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index 12ba6f8..c0a90c9 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -279,12 +279,13 @@ Reference<drawing::XDrawSubController> SlideSorterViewShell::CreateSubController
::com::sun::star::accessibility::XAccessible>
SlideSorterViewShell::CreateAccessibleDocumentView (::sd::Window* pWindow)
{
- OSL_ASSERT(mpSlideSorter.get()!=NULL);
// When the view is not set then the initialization is not yet complete
// and we can not yet provide an accessibility object.
if (mpView == NULL || mpSlideSorter.get() == NULL)
return NULL;
+ OSL_ASSERT(mpSlideSorter.get()!=NULL);
+
::accessibility::AccessibleSlideSorterView *pAccessibleView =
new ::accessibility::AccessibleSlideSorterView(
*mpSlideSorter.get(),
commit f5b0b5f07612dae214d8ded64dbe27510632367c
Author: Petr Mladek <pmladek at suse.cz>
Date: Mon Apr 11 17:52:57 2011 +0200
Version 3.3.99.1, tag libreoffice-3.3.99.1 (3.4.0-beta1)
commit e2587b2bf8b36dfde7ceb88c1386c8e395eb57fc
Author: Thorsten Behrens <tbehrens at novell.com>
Date: Fri Apr 8 09:06:38 2011 +0200
Removed PRESENTER_EXTRA_UI for good
diff --git a/slideshow/source/engine/makefile.mk b/slideshow/source/engine/makefile.mk
index fdc99cd..da01c92 100644
--- a/slideshow/source/engine/makefile.mk
+++ b/slideshow/source/engine/makefile.mk
@@ -37,10 +37,6 @@ ENABLE_EXCEPTIONS=TRUE
.INCLUDE : settings.mk
.INCLUDE : $(PRJ)$/util$/makefile.pmk
-.IF "$(ENABLE_PRESENTER_EXTRA_UI)"=="YES"
-ENABLE_PRESENTER_EXTRA_UI is not used anymore
-.ENDIF
-
# --- Common ----------------------------------------------------------
ENVCFLAGS += -DBOOST_SPIRIT_USE_OLD_NAMESPACE
commit a448845572df3efc8ab9af0fae5b763ef0f0a6d0
Merge: fce1477... 46f0ca0...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Tue Mar 29 15:25:13 2011 +0200
CWS-TOOLING: integrate CWS ka102
commit 46f0ca0e56a62311d5b384959fbebc5fb759e24a
Merge: cf98660... df81695...
Author: ka <kai.ahrens at oracle.com>
Date: Mon Mar 28 22:51:37 2011 +0200
ka102: rebased to DEV300_m104
commit fce14771a9b5700d2ca4416313bc232924e9863c
Merge: 70be530... b0e93f2...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Mar 28 17:00:24 2011 +0200
CWS-TOOLING: integrate CWS fwk167
commit 70be53024bc6981fdd24962e98301fb7b3abeaaf
Merge: df81695... 46ddefd...
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date: Mon Mar 28 15:37:38 2011 +0200
CWS-TOOLING: integrate CWS dba34d
commit df816955bec04dd88edb17928672ca9b177c1523
Merge: 0f59bcc... 4f59146...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Tue Mar 22 17:38:22 2011 +0100
CWS-TOOLING: integrate CWS sw34bf04
commit 0f59bcccd43687dee15a94c624865eb61a38f321
Merge: 9e9aa18... 45607e0...
Author: Vladimir Glazunov <vg at openoffice.org>
Date: Mon Mar 21 17:02:20 2011 +0100
CWS-TOOLING: integrate CWS dba34c
commit b0e93f2dad7aa60b3af4ada5645bb23870aeef96
Author: Mathias Bauer <mba at openoffice.org>
Date: Mon Mar 21 15:12:52 2011 +0100
CWS fwk167: #i117366# - move resources from sfx2 to sd and sc
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 3f0ae0e..da66482 100755
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -426,9 +426,9 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
StyleFamily = SFX_STYLE_FAMILY_PARA ;
FilterList =
{
- < "All Styles" ; SFXSTYLEBIT_ALL ; > ;
- < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
- < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
+ < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
+ < STR_STYLE_FILTER_USED ; SFXSTYLEBIT_USED ; > ;
+ < STR_STYLE_FILTER_USERDEF ; SFXSTYLEBIT_USERDEF ; > ;
};
};
SfxStyleFamilyItem RID_PRESENTATIONSTYLEFAMILY
@@ -437,7 +437,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
StyleFamily = SFX_STYLE_FAMILY_PSEUDO ;
FilterList =
{
- < "All Styles" ; SFXSTYLEBIT_ALL ; > ;
+ < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
};
};
};
@@ -505,4 +505,4 @@ Bitmap BMP_COMMENTS_INDICATOR
Bitmap BMP_COMMENTS_INDICATOR_H
{
File = "comments_indicator_hc.bmp";
-};
\ No newline at end of file
+};
commit fbcc0cafe51940699ab82bf344166e02d9859d08
Author: Mathias Bauer <mba at openoffice.org>
Date: Mon Mar 21 15:01:58 2011 +0100
CWS fwk167: #i117366# - move resources from sfx2 to sd and sc
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 2996640..3f0ae0e 100755
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -403,6 +403,19 @@ Image IMG_REMOVEALLBMP_H
#define SfxStyleFamiliesRes2\
Text [ en-US ] = "Presentation Styles" ;\
+String STR_STYLE_FILTER_USED
+{
+ Text [ en-US ] = "Applied Styles" ;
+};
+String STR_STYLE_FILTER_USERDEF
+{
+ Text [ en-US ] = "Custom Styles" ;
+};
+String STR_STYLE_FILTER_ALL
+{
+ Text [ en-US ] = "All Styles" ;
+};
+
SfxStyleFamilies DLG_STYLE_DESIGNER
{
StyleFamilyList =
@@ -413,9 +426,9 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
StyleFamily = SFX_STYLE_FAMILY_PARA ;
FilterList =
{
- < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
- < STR_STYLE_FILTER_USED ; SFXSTYLEBIT_USED ; > ;
- < STR_STYLE_FILTER_USERDEF ; SFXSTYLEBIT_USERDEF ; > ;
+ < "All Styles" ; SFXSTYLEBIT_ALL ; > ;
+ < "Applied Styles" ; SFXSTYLEBIT_USED ; > ;
+ < "Custom Styles" ; SFXSTYLEBIT_USERDEF ; > ;
};
};
SfxStyleFamilyItem RID_PRESENTATIONSTYLEFAMILY
@@ -424,7 +437,7 @@ SfxStyleFamilies DLG_STYLE_DESIGNER
StyleFamily = SFX_STYLE_FAMILY_PSEUDO ;
FilterList =
{
- < STR_STYLE_FILTER_ALL ; SFXSTYLEBIT_ALL ; > ;
+ < "All Styles" ; SFXSTYLEBIT_ALL ; > ;
};
};
};
commit 7787731b852d340bca0898aece8382ac9e071edb
Merge: 93ad80f... 9e9aa18...
Author: Carsten Driesner <cd at openoffice.org>
Date: Mon Mar 21 14:13:03 2011 +0100
fwk167: Rebase to DEV300m103
commit 46ddefd9c80ac928e62696e73d2a6938df17506a
Merge: 2397bb0... 45607e0...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Tue Mar 15 10:27:32 2011 +0100
dba34d: pulled and merged latest changes from CWS dba34c
diff --cc sd/source/ui/framework/factories/BasicViewFactory.cxx
index f23a685,5570d3a..f612950
mode 100644,100755..100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
commit 45607e0fe7b02c3cf17af56b6a104de695bbe248
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Mar 14 23:01:23 2011 +0100
dba34c: removed conflicting fix for a leaking WorkWindow - both changes together cause a crash
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 232f52b..5570d3a 100755
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -50,7 +50,6 @@
#include <sfx2/viewfrm.hxx>
#include <vcl/wrkwin.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <tools/diagnose_ex.h>
#include <boost/bind.hpp>
@@ -153,20 +152,6 @@ BasicViewFactory::BasicViewFactory (
BasicViewFactory::~BasicViewFactory (void)
{
- mpViewCache.reset();
-
- Reference< awt::XWindow > xLocalPaneWindow( mxLocalPane->getWindow() );
- try
- {
- const Reference< XComponent > xLocalPaneComponent( mxLocalPane, UNO_QUERY_THROW );
- xLocalPaneComponent->dispose();
- const Reference< XComponent > xWindowComponent( xLocalPaneWindow, UNO_QUERY_THROW );
- xWindowComponent->dispose();
- }
- catch( const Exception& )
- {
- DBG_UNHANDLED_EXCEPTION();
- }
}
commit 2397bb06e1addcdaab903a3c5a2746a940a33e99
Merge: d1f6e78... 1882d8f...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Mar 14 10:01:15 2011 +0100
dba34d: pulled and merged DEV300.m102
diff --cc sd/source/ui/framework/factories/BasicViewFactory.cxx
index 232f52b,f612950..f23a685
mode 100755,100644..100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
commit 4f59146bc25ab6da96eab8571f54a17224f0f24c
Merge: 9cbb84b... 1882d8f...
Author: Michael Stahl <mst at openoffice.org>
Date: Fri Mar 11 12:11:04 2011 +0100
sw34bf04: merge DEV300_m102
commit d1f6e78a2c5003e49d7a0caec94ce9c21fd4893a
Merge: da90406... fd67b17...
Author: Ocke Janssen <oj at openoffice.org>
Date: Fri Mar 4 07:53:39 2011 +0100
Automated merge with file:///d:\tools\master\ooo
commit 9cbb84bf263a42aafb94e05a246a0b66559cc5c6
Merge: 93ad80f... 66bf0ea...
Author: Henning Brinkmann <hbrinkm at openoffice.org>
Date: Wed Mar 2 11:45:40 2011 +0100
merge
commit 66bf0ea2478b68a4e79bd40d1dfc179b75659f83
Author: Michael Stahl <mst at openoffice.org>
Date: Tue Mar 1 16:05:30 2011 +0100
sw34bf04: #i103539#: always import meta.xml, to extract the BuildId:
SvXMLMetaDocumentContext: refactor to not require DocumentProperties,
and always set the BuildId from the meta:generator element.
{Sc,Sd,Sw}XMLImport::CreateMetaContext(): always create context.
sc, sd: add OrganizerMode property to ODF import.
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 7134a77..c40480a 100755
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -513,6 +513,9 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
{ MAP_LEN( "BuildId" ), 0,
&::getCppuType( (OUString *)0 ),
::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
+ { MAP_LEN( "OrganizerMode" ), 0,
+ &::getBooleanCppuType(),
+ ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0 },
{ NULL, 0, 0, NULL, 0, 0 }
};
@@ -630,6 +633,13 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
}
}
+ if (SDXMLMODE_Organizer == meFilterMode)
+ {
+ ::rtl::OUString const sOrganizerMode(
+ RTL_CONSTASCII_USTRINGPARAM("OrganizerMode"));
+ xInfoSet->setPropertyValue(sOrganizerMode, uno::makeAny(sal_True));
+ }
+
// -------------------------------------
if( 0 == nRet )
@@ -655,13 +665,14 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
sal_uInt32 nWarn = 0;
sal_uInt32 nWarn2 = 0;
// read storage streams
+ // #i103539#: always read meta.xml for generator
+ nWarn = ReadThroughComponent(
+ xStorage, xModelComp, "meta.xml", "Meta.xml", xServiceFactory,
+ pServices->mpMeta,
+ aEmptyArgs, aName, sal_False );
+
if( meFilterMode != SDXMLMODE_Organizer )
{
- nWarn = ReadThroughComponent(
- xStorage, xModelComp, "meta.xml", "Meta.xml", xServiceFactory,
- pServices->mpMeta,
- aEmptyArgs, aName, sal_False );
-
nWarn2 = ReadThroughComponent(
xStorage, xModelComp, "settings.xml", NULL, xServiceFactory,
pServices->mpSettings,
commit cf986602135a7e2c00c595e2f5eaa57098ce4314
Merge: 964814b... 93ad80f...
Author: ka <kai.ahrens at oracle.com>
Date: Thu Feb 17 21:55:54 2011 +0100
ka102: rebased to DEV300_m100
diff --cc sd/source/ui/view/drviews6.cxx
index 76ff030,e4c6e4f..0664d57
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@@ -449,12 -449,8 +449,12 @@@ void DrawViewShell::GetBmpMaskState( Sf
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
// valid graphic object?
- if( pObj && pObj->ISA( SdrGrafObj ) && !( (SdrGrafObj*) pObj )->IsEPS() && !mpDrawView->IsTextEdit() )
+ if( pObj && pObj->ISA( SdrGrafObj ) &&
+ !( ((SdrGrafObj*) pObj)->IsEPS() || ((SdrGrafObj*) pObj)->IsRenderGraphic() ) &&
+ !mpDrawView->IsTextEdit() )
+ {
- bEnable = TRUE;
+ bEnable = sal_True;
+ }
// put value
rSet.Put( SfxBoolItem( SID_BMPMASK_EXEC, bEnable ) );
commit fd67b179e92c8fa77c6820e1fc0ee70b92484c39
Merge: 8cdb934... 93ad80f...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Feb 14 22:22:46 2011 +0100
dba34c: pulled and merged DEV300.m100
commit 964814b594fd7f72b4f89646b1b2ea5cee72bd5e
Author: ka <kai.ahrens at oracle.com>
Date: Fri Feb 4 14:49:25 2011 +0100
ka102: SVG import implementation
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index 76944c4..76ff030 100755
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -449,8 +449,12 @@ void DrawViewShell::GetBmpMaskState( SfxItemSet& rSet )
pObj = rMarkList.GetMark(0)->GetMarkedSdrObj();
// valid graphic object?
- if( pObj && pObj->ISA( SdrGrafObj ) && !( (SdrGrafObj*) pObj )->IsEPS() && !mpDrawView->IsTextEdit() )
+ if( pObj && pObj->ISA( SdrGrafObj ) &&
+ !( ((SdrGrafObj*) pObj)->IsEPS() || ((SdrGrafObj*) pObj)->IsRenderGraphic() ) &&
+ !mpDrawView->IsTextEdit() )
+ {
bEnable = TRUE;
+ }
// put value
rSet.Put( SfxBoolItem( SID_BMPMASK_EXEC, bEnable ) );
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 115acb3..abe0ee3 100755
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1,7 +1,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -223,6 +223,7 @@ if( aPreviewSizePixel.Width() && aPreviewSizePixel.Height() )
case META_GRADIENTEX_ACTION:
case META_BMPSCALEPART_ACTION:
case META_BMPEXSCALEPART_ACTION:
+ case META_RENDERGRAPHIC_ACTION:
bVector = true;
break;
case META_BMP_ACTION:
commit 8cdb934172c32479a78dc6849fb1500d08d275f6
Merge: b77e5ec... 369ecf5...
Author: Ocke Janssen [oj] <Ocke.Janssen at oracle.com>
Date: Thu Feb 3 12:19:25 2011 +0100
merge from master
commit b77e5ec3f759ecc1b16b31aeecc5db91c571671a
Merge: 800ba1f... eb070e7...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Jan 31 13:14:17 2011 +0100
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34b
commit eb070e72c7550a5f2fe9f381b1aeb35c79a79b71
Merge: 800ba1f... 46b6a2c...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Jan 28 10:30:40 2011 +0100
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34b
commit 46b6a2ca38303cb96fdf212b5e98ff5554758e09
Merge: 800ba1f... 169c44d...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Mon Jan 24 10:24:36 2011 +0100
Automated merge with ssh://hg@hg.services.openoffice.org/cws/dba34b
commit 169c44dd719336085aa35fb88d971a32e8a3aa90
Merge: 93fdf4b... 1ac8f5e...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Jan 7 14:29:08 2011 +0100
dba34c: merge
commit 1ac8f5e289f56e1e340c77da38d0f87a0cffa954
Merge: 93fdf4b... 800ba1f...
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Jan 7 13:50:28 2011 +0100
dba34c: pulled/merged latest changes from CWS dba34b
commit 93fdf4beec3436fc0bfa3783a48371747ef4e829
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Fri Dec 3 14:27:32 2010 +0100
dba34c: #i115901#: dispose the local pane's window (after clearing the cache, which will dispose the windows currently anchored to the pane)
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 98b58fc..207c0ec 100755
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -50,6 +50,7 @@
#include <sfx2/viewfrm.hxx>
#include <vcl/wrkwin.hxx>
#include <toolkit/helper/vclunohelper.hxx>
+#include <tools/diagnose_ex.h>
#include <boost/bind.hpp>
@@ -152,6 +153,20 @@ BasicViewFactory::BasicViewFactory (
BasicViewFactory::~BasicViewFactory (void)
{
+ mpViewCache.reset();
+
+ Reference< awt::XWindow > xLocalPaneWindow( mxLocalPane->getWindow() );
+ try
+ {
+ const Reference< XComponent > xLocalPaneComponent( mxLocalPane, UNO_QUERY_THROW );
+ xLocalPaneComponent->dispose();
+ const Reference< XComponent > xWindowComponent( xLocalPaneWindow, UNO_QUERY_THROW );
+ xWindowComponent->dispose();
+ }
+ catch( const Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
}
commit 501e6b2a8e320ff5e54b50fea8760e590c5a9818
Author: Frank Schoenheit [fs] <frank.schoenheit at oracle.com>
Date: Wed Dec 1 09:57:05 2010 +0100
dba34b: #i113555# when a button's URL points to a document-local target, properly export this to PDF
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 83c713c..37217eb 100755
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2111,7 +2111,12 @@ void SAL_CALL SdXImpressDocument::render( sal_Int32 nRenderer, const uno::Any& r
{
sal_Int32 nPage = ImplPDFGetBookmarkPage( aIBeg->aBookmark, *mpDoc );
if ( nPage != -1 )
- pPDFExtOutDevData->SetLinkDest( aIBeg->nLinkId, pPDFExtOutDevData->CreateDest( aPageRect, nPage, vcl::PDFWriter::FitRectangle ) );
+ {
+ if ( aIBeg->nLinkId != -1 )
+ pPDFExtOutDevData->SetLinkDest( aIBeg->nLinkId, pPDFExtOutDevData->CreateDest( aPageRect, nPage, vcl::PDFWriter::FitRectangle ) );
+ else
+ pPDFExtOutDevData->DescribeRegisteredDest( aIBeg->nDestId, aPageRect, nPage, vcl::PDFWriter::FitRectangle );
+ }
else
pPDFExtOutDevData->SetLinkURL( aIBeg->nLinkId, aIBeg->aBookmark );
aIBeg++;
More information about the Libreoffice-commits
mailing list