summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
Diffstat (limited to 'svtools')
-rw-r--r--svtools/inc/svtools/grfmgr.hxx5
-rw-r--r--svtools/source/contnr/templwin.cxx21
-rw-r--r--svtools/source/control/inettbc.cxx1
-rw-r--r--svtools/source/dialogs/addresstemplate.cxx2
-rw-r--r--svtools/source/dialogs/wizardmachine.cxx1
-rw-r--r--svtools/source/graphic/grfmgr.cxx66
-rw-r--r--svtools/source/misc/imagemgr.cxx69
-rw-r--r--svtools/source/misc/langtab.src12
8 files changed, 122 insertions, 55 deletions
diff --git a/svtools/inc/svtools/grfmgr.hxx b/svtools/inc/svtools/grfmgr.hxx
index 06f75394c8bb..3ed608c1525d 100644
--- a/svtools/inc/svtools/grfmgr.hxx
+++ b/svtools/inc/svtools/grfmgr.hxx
@@ -422,6 +422,11 @@ public:
BOOL Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
const GraphicAttr* pAttr = NULL, ULONG nFlags = GRFMGR_DRAW_STANDARD );
+ BOOL DrawWithPDFHandling( OutputDevice& rOutDev,
+ const Point& rPt, const Size& rSz,
+ const GraphicAttr* pGrfAttr = NULL,
+ const ULONG nFlags = GRFMGR_DRAW_STANDARD );
+
/** Draw the graphic repeatedly into the given output rectangle
@param pOut
diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx
index ab4bda64a652..47b5ab9aa4b9 100644
--- a/svtools/source/contnr/templwin.cxx
+++ b/svtools/source/contnr/templwin.cxx
@@ -1840,26 +1840,7 @@ sal_Bool SvtDocumentTemplateDialog::CanEnableEditBtn() const
if ( pImpl->pWin->IsFileSelected() && aFolderURL.getLength() )
{
::rtl::OUString aFileTargetURL = pImpl->pWin->GetSelectedFile();
- ::rtl::OUString aFolderTargetURL;
-
- ::ucbhelper::Content aFolderContent;
- Reference< XCommandEnvironment > xEnv;
- if ( ::ucbhelper::Content::create( aFolderURL, xEnv, aFolderContent ) )
- try
- {
- ::rtl::OUString aTmpURL;
- uno::Any aValue = aFolderContent.getPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TargetDirURL") ) );
- aValue >>= aTmpURL;
-
- uno::Reference< util::XOfficeInstallationDirectories > xOffInstDirs = pImpl->getOfficeInstDirs();
- if ( xOffInstDirs.is() )
- aFolderTargetURL = xOffInstDirs->makeAbsoluteURL( aTmpURL );
- }
- catch( uno::Exception& )
- {}
-
- if ( aFolderTargetURL.getLength() && ::utl::UCBContentHelper::IsSubPath( aFolderTargetURL, aFileTargetURL ) )
- bEnable = sal_True;
+ bEnable = aFileTargetURL.getLength() > 0;
}
return bEnable;
diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx
index 8aadbb9028b0..02a578629039 100644
--- a/svtools/source/control/inettbc.cxx
+++ b/svtools/source/control/inettbc.cxx
@@ -66,7 +66,6 @@
#include <unotools/historyoptions.hxx>
#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
-#include <svl/cancel.hxx>
#include <svl/itemset.hxx>
#include "svl/urihelper.hxx"
#include <unotools/pathoptions.hxx>
diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index 6647b9eee608..2849ddb71d10 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -854,7 +854,7 @@ void AssignmentPersistentData::Commit()
m_aDatasource.SaveValue();
// create an interaction handler (may be needed for connecting)
- const String sInteractionHandlerServiceName = String::CreateFromAscii("com.sun.star.sdb.InteractionHandler");
+ const String sInteractionHandlerServiceName = String::CreateFromAscii("com.sun.star.task.InteractionHandler");
Reference< XInteractionHandler > xHandler;
try
{
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index bac18a2932dc..6a09f85036fd 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -90,7 +90,6 @@ namespace svt
void OWizardPage::updateDialogTravelUI()
{
OWizardMachine* pWizardMachine = dynamic_cast< OWizardMachine* >( GetParent() );
- OSL_ENSURE( pWizardMachine, "OWizardPage::updateDialogTravelUI: where am I?" );
if ( pWizardMachine )
pWizardMachine->updateTravelUI();
}
diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx
index 53f4a3ed2515..221354cc6665 100644
--- a/svtools/source/graphic/grfmgr.cxx
+++ b/svtools/source/graphic/grfmgr.cxx
@@ -44,6 +44,10 @@
#include <unotools/cacheoptions.hxx>
#include <svtools/grfmgr.hxx>
+// --> OD 2010-01-04 #i105243#
+#include <vcl/pdfextoutdevdata.hxx>
+// <--
+
// -----------
// - Defines -
// -----------
@@ -738,6 +742,68 @@ BOOL GraphicObject::Draw( OutputDevice* pOut, const Point& rPt, const Size& rSz,
return bRet;
}
+// --> OD 2010-01-04 #i105243#
+BOOL GraphicObject::DrawWithPDFHandling( OutputDevice& rOutDev,
+ const Point& rPt, const Size& rSz,
+ const GraphicAttr* pGrfAttr,
+ const ULONG nFlags )
+{
+ const GraphicAttr aGrfAttr( pGrfAttr ? *pGrfAttr : GetAttr() );
+
+ // Notify PDF writer about linked graphic (if any)
+ bool bWritingPdfLinkedGraphic( false );
+ Point aPt( rPt );
+ Size aSz( rSz );
+ Rectangle aCropRect;
+ vcl::PDFExtOutDevData* pPDFExtOutDevData =
+ dynamic_cast<vcl::PDFExtOutDevData*>(rOutDev.GetExtOutDevData());
+ if( pPDFExtOutDevData )
+ {
+ // only delegate image handling to PDF, if no special treatment is necessary
+ if( GetGraphic().IsLink() &&
+ rSz.Width() > 0L &&
+ rSz.Height() > 0L &&
+ !aGrfAttr.IsSpecialDrawMode() &&
+ !aGrfAttr.IsMirrored() &&
+ !aGrfAttr.IsRotated() &&
+ !aGrfAttr.IsAdjusted() )
+ {
+ bWritingPdfLinkedGraphic = true;
+
+ if( aGrfAttr.IsCropped() )
+ {
+ PolyPolygon aClipPolyPoly;
+ BOOL bRectClip;
+ const BOOL bCrop = ImplGetCropParams( &rOutDev,
+ aPt, aSz,
+ &aGrfAttr,
+ aClipPolyPoly,
+ bRectClip );
+ if ( bCrop && bRectClip )
+ {
+ aCropRect = aClipPolyPoly.GetBoundRect();
+ }
+ }
+
+ pPDFExtOutDevData->BeginGroup();
+ }
+ }
+
+ BOOL bRet = Draw( &rOutDev, rPt, rSz, &aGrfAttr, nFlags );
+
+ // Notify PDF writer about linked graphic (if any)
+ if( bWritingPdfLinkedGraphic )
+ {
+ pPDFExtOutDevData->EndGroup( const_cast< Graphic& >(GetGraphic()),
+ aGrfAttr.GetTransparency(),
+ Rectangle( aPt, aSz ),
+ aCropRect );
+ }
+
+ return bRet;
+}
+// <--
+
// -----------------------------------------------------------------------------
BOOL GraphicObject::DrawTiled( OutputDevice* pOut, const Rectangle& rArea, const Size& rSize,
diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx
index e57c0d21d98a..391ad02e6aa1 100644
--- a/svtools/source/misc/imagemgr.cxx
+++ b/svtools/source/misc/imagemgr.cxx
@@ -73,33 +73,35 @@ struct SvtExtensionResIdMapping_Impl
static SvtExtensionResIdMapping_Impl __READONLY_DATA ExtensionMap_Impl[] =
{
- { "awk", TRUE, STR_DESCRIPTION_SOURCEFILE, IMG_TEXTFILE },
- { "bas", TRUE, STR_DESCRIPTION_SOURCEFILE, IMG_TEXTFILE },
- { "bat", TRUE, STR_DESCRIPTION_BATCHFILE, IMG_APP },
+ { "awk", TRUE, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "bas", TRUE, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "bat", TRUE, STR_DESCRIPTION_BATCHFILE, 0 },
{ "bmk", FALSE, STR_DESCRIPTION_BOOKMARKFILE, 0 },
{ "bmp", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_BITMAP },
- { "c", TRUE, STR_DESCRIPTION_SOURCEFILE, IMG_TEXTFILE },
+ { "c", TRUE, STR_DESCRIPTION_SOURCEFILE, 0 },
{ "cfg", FALSE, STR_DESCRIPTION_CFGFILE, 0 },
- { "cmd", TRUE, STR_DESCRIPTION_BATCHFILE, IMG_APP },
- { "cob", TRUE, STR_DESCRIPTION_SOURCEFILE, IMG_TEXTFILE },
- { "com", TRUE, STR_DESCRIPTION_APPLICATION, IMG_APP },
- { "cxx", TRUE, STR_DESCRIPTION_SOURCEFILE, IMG_TEXTFILE },
+ { "cmd", TRUE, STR_DESCRIPTION_BATCHFILE, 0 },
+ { "cob", TRUE, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "com", TRUE, STR_DESCRIPTION_APPLICATION, 0 },
+ { "cxx", TRUE, STR_DESCRIPTION_SOURCEFILE, 0 },
{ "dbf", TRUE, STR_DESCRIPTION_DATABASE_TABLE, IMG_TABLE },
- { "def", TRUE, STR_DESCRIPTION_SOURCEFILE, IMG_TEXTFILE },
+ { "def", TRUE, STR_DESCRIPTION_SOURCEFILE, 0 },
{ "dll", TRUE, STR_DESCRIPTION_SYSFILE, 0 },
- { "doc", FALSE, STR_DESCRIPTION_WORD_DOC, IMG_WORD },
+ { "doc", FALSE, STR_DESCRIPTION_WORD_DOC, IMG_WRITER },
+ { "dot", FALSE, STR_DESCRIPTION_WORD_DOC, IMG_WRITERTEMPLATE },
+ { "docx", FALSE, STR_DESCRIPTION_WORD_DOC, IMG_WRITER },
{ "dxf", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_DXF },
- { "exe", TRUE, STR_DESCRIPTION_APPLICATION, IMG_APP },
+ { "exe", TRUE, STR_DESCRIPTION_APPLICATION, 0 },
{ "gif", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_GIF },
- { "h", TRUE, STR_DESCRIPTION_SOURCEFILE, IMG_TEXTFILE },
- { "hlp", FALSE, STR_DESCRIPTION_HELP_DOC, IMG_HELP },
- { "hrc", TRUE, STR_DESCRIPTION_SOURCEFILE, IMG_TEXTFILE },
+ { "h", TRUE, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "hlp", FALSE, STR_DESCRIPTION_HELP_DOC, 0 },
+ { "hrc", TRUE, STR_DESCRIPTION_SOURCEFILE, 0 },
{ "htm", FALSE, STR_DESCRIPTION_HTMLFILE, IMG_HTML },
{ "html", FALSE, STR_DESCRIPTION_HTMLFILE, IMG_HTML },
{ "asp", FALSE, STR_DESCRIPTION_HTMLFILE, IMG_HTML },
- { "hxx", TRUE, STR_DESCRIPTION_SOURCEFILE, IMG_TEXTFILE },
+ { "hxx", TRUE, STR_DESCRIPTION_SOURCEFILE, 0 },
{ "ini", FALSE, STR_DESCRIPTION_CFGFILE, 0 },
- { "java", TRUE, STR_DESCRIPTION_SOURCEFILE, IMG_TEXTFILE },
+ { "java", TRUE, STR_DESCRIPTION_SOURCEFILE, 0 },
{ "jpeg", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_JPG },
{ "jpg", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_JPG },
{ "lha", TRUE, STR_DESCRIPTION_ARCHIVFILE, 0 },
@@ -110,7 +112,7 @@ static SvtExtensionResIdMapping_Impl __READONLY_DATA ExtensionMap_Impl[] =
{ "lst", TRUE, STR_DESCRIPTION_LOGFILE, 0 },
{ "met", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_MET },
{ "mml", FALSE, STR_DESCRIPTION_MATHML_DOC, IMG_MATH },
- { "mod", TRUE, STR_DESCRIPTION_SOURCEFILE, IMG_TEXTFILE },
+ { "mod", TRUE, STR_DESCRIPTION_SOURCEFILE, 0 },
{ "odb", FALSE, STR_DESCRIPTION_OO_DATABASE_DOC, IMG_OO_DATABASE_DOC },
{ "odg", FALSE, STR_DESCRIPTION_OO_DRAW_DOC, IMG_OO_DRAW_DOC },
{ "odf", FALSE, STR_DESCRIPTION_OO_MATH_DOC, IMG_OO_MATH_DOC },
@@ -122,31 +124,32 @@ static SvtExtensionResIdMapping_Impl __READONLY_DATA ExtensionMap_Impl[] =
{ "otp", FALSE, STR_DESCRIPTION_OO_IMPRESS_TEMPLATE, IMG_OO_IMPRESS_TEMPLATE },
{ "ots", FALSE, STR_DESCRIPTION_OO_CALC_TEMPLATE, IMG_OO_CALC_TEMPLATE },
{ "ott", FALSE, STR_DESCRIPTION_OO_WRITER_TEMPLATE, IMG_OO_WRITER_TEMPLATE },
- { "pas", TRUE, STR_DESCRIPTION_SOURCEFILE, IMG_TEXTFILE },
+ { "pas", TRUE, STR_DESCRIPTION_SOURCEFILE, 0 },
{ "pcd", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCD },
{ "pct", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCT },
{ "pcx", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PCX },
- { "pl", TRUE, STR_DESCRIPTION_SOURCEFILE, IMG_TEXTFILE },
+ { "pl", TRUE, STR_DESCRIPTION_SOURCEFILE, 0 },
{ "png", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_PNG },
{ "rar", TRUE, STR_DESCRIPTION_ARCHIVFILE, 0 },
- { "sbl", FALSE, 0, IMG_MACROLIB },
+ { "rtf", FALSE, STR_DESCRIPTION_WORD_DOC, IMG_WRITER },
+ { "sbl", FALSE, 0, 0 },
{ "sch", FALSE, 0, 0 },
{ "sda", FALSE, STR_DESCRIPTION_SDRAW_DOC, IMG_DRAW },
{ "sdb", FALSE, STR_DESCRIPTION_SDATABASE_DOC, IMG_DATABASE },
{ "sdc", FALSE, STR_DESCRIPTION_SCALC_DOC, IMG_CALC },
{ "sdd", FALSE, STR_DESCRIPTION_SIMPRESS_DOC, IMG_IMPRESS },
- { "sdp", FALSE, STR_DESCRIPTION_SIMPRESS_DOC, IMG_IMPRESSPACKED },
- { "sds", FALSE, STR_DESCRIPTION_SCHART_DOC, IMG_CHART },
+ { "sdp", FALSE, STR_DESCRIPTION_SIMPRESS_DOC, 0 },
+ { "sds", FALSE, STR_DESCRIPTION_SCHART_DOC, 0 },
{ "sdw", FALSE, STR_DESCRIPTION_SWRITER_DOC, IMG_WRITER },
- { "sga", FALSE, 0, IMG_GALLERY },
+ { "sga", FALSE, 0, 0 },
{ "sgf", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_SGF },
{ "sgl", FALSE, STR_DESCRIPTION_GLOBALDOC, IMG_GLOBAL_DOC },
{ "sgv", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_SGV },
{ "shtml", FALSE, STR_DESCRIPTION_HTMLFILE, IMG_HTML },
{ "sim", FALSE, STR_DESCRIPTION_SIMAGE_DOC, IMG_SIM },
{ "smf", FALSE, STR_DESCRIPTION_SMATH_DOC, IMG_MATH },
- { "src", TRUE, STR_DESCRIPTION_SOURCEFILE, IMG_TEXTFILE },
- { "svh", FALSE, STR_DESCRIPTION_HELP_DOC, IMG_SVHELP },
+ { "src", TRUE, STR_DESCRIPTION_SOURCEFILE, 0 },
+ { "svh", FALSE, STR_DESCRIPTION_HELP_DOC, 0 },
{ "svm", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_SVM },
{ "stc", FALSE, STR_DESCRIPTION_CALC_TEMPLATE, IMG_CALCTEMPLATE },
{ "std", FALSE, STR_DESCRIPTION_DRAW_TEMPLATE, IMG_DRAWTEMPLATE },
@@ -157,27 +160,29 @@ static SvtExtensionResIdMapping_Impl __READONLY_DATA ExtensionMap_Impl[] =
{ "sxg", FALSE, STR_DESCRIPTION_SXGLOBAL_DOC, IMG_GLOBAL_DOC },
{ "sxi", FALSE, STR_DESCRIPTION_SXIMPRESS_DOC, IMG_IMPRESS },
{ "sxm", FALSE, STR_DESCRIPTION_SXMATH_DOC, IMG_MATH },
- { "sxs", FALSE, STR_DESCRIPTION_SXCHART_DOC, IMG_CHART },
+ { "sxs", FALSE, STR_DESCRIPTION_SXCHART_DOC, 0 },
{ "sxw", FALSE, STR_DESCRIPTION_SXWRITER_DOC, IMG_WRITER },
{ "sys", TRUE, STR_DESCRIPTION_SYSFILE, 0 },
{ "tif", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_TIFF },
{ "tiff", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_TIFF },
{ "txt", FALSE, STR_DESCRIPTION_TEXTFILE, IMG_TEXTFILE },
- { "url", FALSE, STR_DESCRIPTION_LINK, IMG_HTML },
+ { "url", FALSE, STR_DESCRIPTION_LINK, 0 },
{ "vor", FALSE, STR_DESCRIPTION_SOFFICE_TEMPLATE_DOC, IMG_WRITERTEMPLATE },
{ "vxd", TRUE, STR_DESCRIPTION_SYSFILE, 0 },
{ "wmf", TRUE, STR_DESCRIPTION_GRAPHIC_DOC, IMG_WMF },
- { "xls", FALSE, STR_DESCRIPTION_EXCEL_DOC, IMG_EXCEL },
- { "xlt", FALSE, STR_DESCRIPTION_EXCEL_TEMPLATE_DOC, IMG_EXCELTEMPLATE },
+ { "xls", FALSE, STR_DESCRIPTION_EXCEL_DOC, IMG_CALC },
+ { "xlt", FALSE, STR_DESCRIPTION_EXCEL_TEMPLATE_DOC, IMG_CALCTEMPLATE },
+ { "xlsx", FALSE, STR_DESCRIPTION_EXCEL_DOC, IMG_CALC },
{ "uu", TRUE, STR_DESCRIPTION_ARCHIVFILE, 0 },
{ "uue", TRUE, STR_DESCRIPTION_ARCHIVFILE, 0 },
{ "z", TRUE, STR_DESCRIPTION_ARCHIVFILE, 0 },
{ "zip", TRUE, STR_DESCRIPTION_ARCHIVFILE, 0 },
{ "zoo", TRUE, STR_DESCRIPTION_ARCHIVFILE, 0 },
{ "gz", TRUE, STR_DESCRIPTION_ARCHIVFILE, 0 },
- { "ppt", FALSE, STR_DESCRIPTION_POWERPOINT, IMG_POWERPOINT },
- { "pot", FALSE, STR_DESCRIPTION_POWERPOINT_TEMPLATE, IMG_POWERPOINTTEMPLATE },
- { "pps", FALSE, STR_DESCRIPTION_POWERPOINT_SHOW, IMG_POWERPOINT },
+ { "ppt", FALSE, STR_DESCRIPTION_POWERPOINT, IMG_IMPRESS },
+ { "pot", FALSE, STR_DESCRIPTION_POWERPOINT_TEMPLATE, IMG_IMPRESSTEMPLATE },
+ { "pps", FALSE, STR_DESCRIPTION_POWERPOINT_SHOW, IMG_IMPRESS },
+ { "pptx", FALSE, STR_DESCRIPTION_POWERPOINT, IMG_IMPRESS },
{ "oxt", FALSE, STR_DESCRIPTION_EXTENSION, IMG_EXTENSION },
{ 0, FALSE, 0, 0 }
};
diff --git a/svtools/source/misc/langtab.src b/svtools/source/misc/langtab.src
index 929276cfbdb5..39f9362e3940 100644
--- a/svtools/source/misc/langtab.src
+++ b/svtools/source/misc/langtab.src
@@ -307,6 +307,18 @@ StringArray STR_ARR_SVT_LANGUAGE_TABLE
< "Asturian" ; LANGUAGE_USER_ASTURIAN ; > ;
< "Sorbian, Upper" ; LANGUAGE_UPPER_SORBIAN_GERMANY ; > ;
< "Sorbian, Lower" ; LANGUAGE_LOWER_SORBIAN_GERMANY ; > ;
+ < "Latgalian" ; LANGUAGE_USER_LATGALIAN ; > ;
+ < "Maore" ; LANGUAGE_USER_MAORE ; > ;
+ < "Bushi" ; LANGUAGE_USER_BUSHI ; > ;
+ < "Tahitian" ; LANGUAGE_USER_TAHITIAN ; > ;
+ < "Malagasy, Plateau" ; LANGUAGE_USER_MALAGASY_PLATEAU ; > ;
+ < "Papiamentu (Netherlands Antilles)" ; LANGUAGE_PAPIAMENTU ; > ;
+ < "Papiamento (Aruba)" ; LANGUAGE_USER_PAPIAMENTU_ARUBA ; > ;
+ < "Sardinian, Campidanese" ; LANGUAGE_USER_SARDINIAN_CAMPIDANESE ; > ;
+ < "Sardinian, Gallurese" ; LANGUAGE_USER_SARDINIAN_GALLURESE ; > ;
+ < "Sardinian, Logudorese" ; LANGUAGE_USER_SARDINIAN_LOGUDORESE ; > ;
+ < "Sardinian, Sassarese" ; LANGUAGE_USER_SARDINIAN_SASSARESE ; > ;
+ < "Bafia" ; LANGUAGE_USER_BAFIA ; > ;
};
};
generated by cgit (git 2.34.1) at 2024-08-05 00:16:12 +0000