Merge commit 'ooo/DEV300_m106' into libreoffice-3-4

Conflicts:
sd/source/ui/app/res_bmp.src

5 files changed, 41 insertions, 7 deletions

diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index 5b7f42d3878b..0810204842c2 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -514,6 +514,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 }
     };
 
@@ -631,6 +634,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 )
@@ -656,13 +666,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,
diff --git a/sd/source/ui/app/res_bmp.src b/sd/source/ui/app/res_bmp.src
index 80160cdeb6c1..7660437b3d01 100644
--- a/sd/source/ui/app/res_bmp.src
+++ b/sd/source/ui/app/res_bmp.src
@@ -253,6 +253,19 @@ Bitmap BMP_GRAPHIC
 #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 =
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 9d3cc6f343f7..f222b349b4fd 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -2073,7 +2073,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;
diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx
index b178aa5fef1c..73c4eded2346 100644
--- a/sd/source/ui/view/drviews6.cxx
+++ b/sd/source/ui/view/drviews6.cxx
@@ -428,8 +428,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 = sal_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 5b74b8e1494d..f1755308cc9c 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -199,6 +199,7 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo
                 case META_GRADIENTEX_ACTION:
                 case META_BMPSCALEPART_ACTION:
                 case META_BMPEXSCALEPART_ACTION:
+                case META_RENDERGRAPHIC_ACTION:
                     bVector = true;
                     break;
                 case META_BMP_ACTION: