strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CWS-TOOLING: integrate CWS sw33bf06_OOO330

Browse source
This commit is contained in:
Kurt Zenker 2010-07-13 14:54:15 +02:00
commit 49b06312d1
4 changed files with 44 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sfx2/source/view/viewimp.hxx
View file

@ -75,7 +75,7 @@ struct SfxViewShell_Impl
::svt::AcceleratorExecute* pAccExec;
com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aPrintOpts;
::rtl::Reference< SfxClipboardChangeListener > xClipboardListener;
vcl::PrinterController* pPrinterController;
::boost::shared_ptr< vcl::PrinterController > m_pPrinterController;
SfxViewShell_Impl();
};

9
sfx2/source/view/viewprn.cxx
View file

@ -332,7 +332,9 @@ void SfxPrinterController::jobFinished( com::sun::star::view::PrintableState nSt
mpObjectShell->EnableSetModified( m_bOrigStatus );
if ( mpViewShell )
mpViewShell->pImp->pPrinterController = 0;
{
mpViewShell->pImp->m_pPrinterController.reset();
}
}
}
@ -643,7 +645,7 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro
this,
rProps
) );
pImp->pPrinterController = pController.get();
pImp->m_pPrinterController = pController;
SfxObjectShell *pObjShell = GetObjectShell();
pController->setValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "JobName" ) ),
@ -661,7 +663,8 @@ void SfxViewShell::ExecPrint( const uno::Sequence < beans::PropertyValue >& rPro
Printer* SfxViewShell::GetActivePrinter() const
{
return pImp->pPrinterController ? pImp->pPrinterController->getPrinter().get() : 0;
return (pImp->m_pPrinterController)
? pImp->m_pPrinterController->getPrinter().get() : 0;
}
void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq )

37
xmloff/source/core/RDFaExportHelper.cxx
View file

@ -37,6 +37,8 @@
#include <comphelper/stlunosequence.hxx>
#include <comphelper/stl_types.hxx>
#include <com/sun/star/uri/XUriReference.hpp>
#include <com/sun/star/uri/XUriReferenceFactory.hpp>
#include <com/sun/star/rdf/Statement.hpp>
#include <com/sun/star/rdf/URIs.hpp>
#include <com/sun/star/rdf/URI.hpp>
@ -85,6 +87,39 @@ makeCURIE(SvXMLExport * i_pExport,
return buf.makeStringAndClear();
}
// #i112473# SvXMLExport::GetRelativeReference() not right for RDF on SaveAs
// because the URIs in the repository are not rewritten on SaveAs, the
// URI of the loaded document has to be used, not the URI of the target doc.
static ::rtl::OUString
getRelativeReference(SvXMLExport const& rExport, ::rtl::OUString const& rURI)
{
uno::Reference< rdf::XURI > const xModelURI(
rExport.GetModel(), uno::UNO_QUERY_THROW );
::rtl::OUString const baseURI( xModelURI->getStringValue() );
uno::Reference<uno::XComponentContext> const xContext(
rExport.GetComponentContext());
uno::Reference<lang::XMultiComponentFactory> const xServiceFactory(
xContext->getServiceManager(), uno::UNO_SET_THROW);
uno::Reference<uri::XUriReferenceFactory> const xUriFactory(
xServiceFactory->createInstanceWithContext(
::rtl::OUString::createFromAscii(
"com.sun.star.uri.UriReferenceFactory"), xContext),
uno::UNO_QUERY_THROW);
uno::Reference< uri::XUriReference > const xBaseURI(
xUriFactory->parse(baseURI), uno::UNO_SET_THROW );
uno::Reference< uri::XUriReference > const xAbsoluteURI(
xUriFactory->parse(rURI), uno::UNO_SET_THROW );
uno::Reference< uri::XUriReference > const xRelativeURI(
xUriFactory->makeRelative(xBaseURI, xAbsoluteURI, true, true, false),
uno::UNO_SET_THROW );
::rtl::OUString const relativeURI(xRelativeURI->getUriReference());
return relativeURI;
}
////////////////////////////////////////////////////////////////////////////
RDFaExportHelper::RDFaExportHelper(SvXMLExport & i_rExport)
@ -145,7 +180,7 @@ RDFaExportHelper::AddRDFa(
static const sal_Unicode s_OpenBracket ('[');
static const sal_Unicode s_CloseBracket(']');
const ::rtl::OUString about( xSubjectURI.is()
? m_rExport.GetRelativeReference(xSubjectURI->getStringValue())
? getRelativeReference(m_rExport, xSubjectURI->getStringValue())
: ::rtl::OUStringBuffer().append(s_OpenBracket).append(
LookupBlankNode(xSubjectBNode)).append(s_CloseBracket)
.makeStringAndClear()

1
xmloff/source/text/XMLTextMarkImportContext.cxx
View file

@ -116,6 +116,7 @@ XMLTextMarkImportContext::XMLTextMarkImportContext(
const OUString& rLocalName )
: SvXMLImportContext(rImport, nPrefix, rLocalName)
, m_rHelper(rHlp)
, m_bHaveAbout(false)
{
}