re-base on ALv2 code. Includes:

Patches contributed by Oliver-Rainer Wittmann
sw34bf06: #i117783# - Writer's implementation of XPagePrintable -
apply print settings to new printing routines
http://svn.apache.org/viewvc?view=revision&revision=1172115
sw34bf06: #o12311627# use <rtl_random> methods to
create unique ids for list styles and list ids
http://svn.apache.org/viewvc?view=revision&revision=1172112
sw34bf06 #i114725#,#i115828# - method <SwDoc::ClearDoc()> -
clear list structures completely
http://svn.apache.org/viewvc?view=revision&revision=1172122
i#118572 - remove ui string and help content regarding usage of
Java Mail in Writer's Mail Merge as Java Mail is not used.
http://svn.apache.org/viewvc?view=revision&revision=1197035

Patches contributed by Mathias Bauer
cws mba34issues01: #i117718#: provide filter name in
case storage of medium does not allow to detect one
http://svn.apache.org/viewvc?view=revision&revision=1172350
cws mba34issues01: #i117721#: directly provide
parameters retrieved from SfxMedium
http://svn.apache.org/viewvc?view=revision&revision=1172353
gnumake4 work variously
http://svn.apache.org/viewvc?view=revision&revision=1394707
http://svn.apache.org/viewvc?view=revision&revision=1394326
http://svn.apache.org/viewvc?view=revision&revision=1396797
http://svn.apache.org/viewvc?view=revision&revision=1397315
cws mba34issues01: #i117723#: convert assertion into trace
http://svn.apache.org/viewvc?view=revision&revision=1172355
cws mba34issues01: #i117699#: keep layout alive until swdoc dies
http://svn.apache.org/viewvc?view=revision&revision=1172362
cws mba34issues01: #i117943#: missing color attributes in RTF clipboard
http://svn.apache.org/viewvc?view=revision&revision=1172363

Patch contributed by Henning Brinkmann
imported patch i#103878
http://svn.apache.org/viewvc?view=revision&revision=1172109

Patches contributed by Michael Stahl
sw34bf06: #i117955#: WW8 export: disable storing of section breaks in endnotes
http://svn.apache.org/viewvc?view=revision&revision=1172119

Patch contributed by imacat
Fixed the Asian language work count.
http://svn.apache.org/viewvc?view=revision&revision=1241345

Patch contributed by Pedro Giffuni
i#20878 - Add comment with BZ issue for reference.
http://svn.apache.org/viewvc?view=revision&revision=1244517

Patch contributed by Andre Fischer
Do not add targets for junit tests when junit is disabled.
http://svn.apache.org/viewvc?view=revision&revision=1241508

add writerperfect dependency.

2 files changed, 22 insertions, 1 deletions

diff --git a/sfx2/inc/sfx2/docfile.hxx b/sfx2/inc/sfx2/docfile.hxx
index 9b347e0475e6..f989fdefb77b 100644
--- a/sfx2/inc/sfx2/docfile.hxx
+++ b/sfx2/inc/sfx2/docfile.hxx
@@ -99,6 +99,10 @@ public:
                         SfxMedium( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
                                     const String& rBaseURL,
                                     const SfxItemSet* pSet=0 );
+                        SfxMedium( const ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage >& xStorage,
+                                    const String& rBaseURL,
+                                    const String& rTypeName,
+                                    const SfxItemSet* pSet=0 );
                         SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs );
 
                         ~SfxMedium();
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index b1f3541c22d2..2287e9ea1cf6 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -2885,7 +2885,6 @@ SfxMedium::SfxMedium(const String &rName, StreamMode nOpenMode, const SfxFilter
     Init_Impl();
 }
 
-
 SfxMedium::SfxMedium( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) :
     pImp(new SfxMedium_Impl(this))
 {
@@ -2958,6 +2957,24 @@ SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const Str
 
 //------------------------------------------------------------------
 
+SfxMedium::SfxMedium( const uno::Reference < embed::XStorage >& rStor, const String& rBaseURL, const String &rTypeName, const SfxItemSet* p ) :
+    pImp(new SfxMedium_Impl(this))
+{
+    pImp->m_pFilter = SFX_APP()->GetFilterMatcher().GetFilter4EA( rTypeName );
+    DBG_ASSERT( pImp->m_pFilter, "No Filter for storage found!" );
+
+    Init_Impl();
+    pImp->xStorage = rStor;
+    pImp->bDisposeStorage = false;
+
+    // always take BaseURL first, could be overwritten by ItemSet
+    GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, rBaseURL ) );
+    if ( p )
+        GetItemSet()->Put( *p );
+}
+
+//------------------------------------------------------------------
+
 SfxMedium::~SfxMedium()
 {
     // if there is a requirement to clean the backup this is the last possibility to do it