[Libreoffice-commits] core.git: Branch 'feature/smartart-persistence' - 374 commits - avmedia/Library_avmediagst_0_10.mk avmedia/Library_avmediagst.mk avmedia/Library_avmediavlc.mk avmedia/source basctl/source bridges/source comphelper/source compilerplugins/clang config_host/config_buildid.h.in config_host.mk.in configure.ac connectivity/source cppcanvas/source cui/Library_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk dbaccess/source desktop/win32 download.lst drawinglayer/source editeng/Library_editeng.mk editeng/qa editeng/source embeddedobj/Module_embeddedobj.mk extensions/Module_extensions.mk extras/source filter/qa firebird/ExternalPackage_firebird.mk firebird/ExternalProject_firebird.mk firebird/firebird-macosx.patch.1 firebird/firebird-rpath.patch.0 firebird/UnpackedTarball_firebird.mk formula/source framework/source graphite/graphite2.issue1030.patch.1 graphite/UnpackedTarball_graphite.mk helpcontent2 i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk i18nlangtag/Librar y_i18nlangtag.mk i18nlangtag/qa i18nlangtag/source icon-themes/galaxy idlc/source include/basebmp include/editeng include/formula include/i18nlangtag include/osl include/sal include/sfx2 include/svl include/svtools include/svx include/tools include/unotools include/vcl ios/.DS_Store ios/iosremote javaunohelper/com javaunohelper/Jar_juh.mk jvmfwk/distributions liblangtag/Module_liblangtag.mk librelogo/source libvisio/libvisio-0.0.30-msvc.patch.1 libvisio/libvisio-wpx_seek_end.patch.1 libvisio/UnpackedTarball_libvisio.mk Makefile.in np_sdk/Module_np_sdk.mk odk/Package_javadoc.mk odk/source offapi/com oox/source package/source postprocess/Rdb_services.mk python3/ExternalProject_python3.mk qadevOOo/objdsc qadevOOo/tests README.Android registry/tools RepositoryExternal.mk Repository.mk rsc/inc rsc/source sal/osl sal/rtl sal/textenc sc/inc scp2/InstallModule_firebird.mk scp2/InstallScript_setup_osl.mk scp2/source sc/qa sc/sdi sc/source sc/uiconfig sd/inc sd/README sd/source sfx2/i nc sfx2/sdi sfx2/source sfx2/uiconfig shell/source solenv/bin solenv/gbuild soltools/mkdepend svl/source svtools/source svx/source sw/inc sw/qa sw/source sw/uiconfig sw/UIConfig_swriter.mk test/Package_unittest.mk testtools/CustomTarget_bridgetest.mk testtools/CustomTarget_uno_test.mk test/user-template toolkit/source tools/source translations ucb/source udkapi/com unotools/source unusedcode.easy ure/source vcl/coretext vcl/generic vcl/Library_vcl.mk vcl/source vcl/unx vcl/win writerfilter/source writerperfect/source
Andres Gomez
agomez at igalia.com
Fri Aug 30 07:13:34 PDT 2013
Makefile.in | 46
README.Android | 2
Repository.mk | 67
RepositoryExternal.mk | 2
avmedia/Library_avmediagst.mk | 6
avmedia/Library_avmediagst_0_10.mk | 6
avmedia/Library_avmediavlc.mk | 7
avmedia/source/vlc/vlcmanager.cxx | 21
avmedia/source/vlc/vlcplayer.hxx | 1
avmedia/source/vlc/wrapper/Common.cxx | 33
avmedia/source/vlc/wrapper/Common.hxx | 24
avmedia/source/vlc/wrapper/EventManager.cxx | 7
avmedia/source/vlc/wrapper/Instance.hxx | 2
avmedia/source/vlc/wrapper/Types.hxx | 38
basctl/source/basicide/basides1.cxx | 2
basctl/source/basicide/basides2.cxx | 2
bridges/source/cpp_uno/gcc3_macosx_intel/except.cxx | 166
comphelper/source/misc/accessibleeventnotifier.cxx | 33
compilerplugins/clang/store/valueof.cxx | 148
compilerplugins/clang/valueof.cxx | 148
config_host.mk.in | 2
config_host/config_buildid.h.in | 10
configure.ac | 139
connectivity/source/commontools/ConnectionWrapper.cxx | 2
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 4
connectivity/source/drivers/firebird/Driver.cxx | 17
connectivity/source/drivers/firebird/Driver.hxx | 4
connectivity/source/drivers/firebird/PreparedStatement.cxx | 177
connectivity/source/drivers/firebird/PreparedStatement.hxx | 32
connectivity/source/drivers/firebird/ResultSet.cxx | 198
connectivity/source/drivers/firebird/ResultSet.hxx | 48
connectivity/source/drivers/firebird/Statement.cxx | 24
connectivity/source/drivers/firebird/StatementCommonBase.cxx | 96
connectivity/source/drivers/firebird/StatementCommonBase.hxx | 6
connectivity/source/drivers/firebird/Util.cxx | 20
connectivity/source/drivers/odbcbase/OResultSet.cxx | 86
cppcanvas/source/inc/implrenderer.hxx | 5
cppcanvas/source/mtfrenderer/emfplus.cxx | 15
cppcanvas/source/mtfrenderer/implrenderer.cxx | 5
cui/Library_cui.mk | 1
cui/UIConfig_cui.mk | 1
cui/source/dialogs/about.cxx | 10
cui/source/dialogs/cuiimapwnd.cxx | 2
cui/source/dialogs/hangulhanjadlg.cxx | 5
cui/source/dialogs/hltpbase.cxx | 6
cui/source/dialogs/linkdlg.cxx | 22
cui/source/factory/dlgfact.cxx | 20
cui/source/factory/dlgfact.hxx | 14
cui/source/inc/cuires.hrc | 1
cui/source/inc/helpid.hrc | 1
cui/source/options/optlingu.cxx | 85
cui/source/options/optlingu.hrc | 8
cui/source/options/optlingu.src | 55
cui/uiconfig/ui/breaknumberoption.ui | 207
cui/uiconfig/ui/optmemorypage.ui | 6
dbaccess/source/core/api/BookmarkSet.cxx | 1
dbaccess/source/core/api/CIndexes.cxx | 1
dbaccess/source/core/api/CRowSetColumn.cxx | 1
dbaccess/source/core/api/CRowSetDataColumn.cxx | 1
dbaccess/source/core/api/CacheSet.cxx | 1
dbaccess/source/core/api/FilteredContainer.cxx | 5
dbaccess/source/core/api/HelperCollections.hxx | 4
dbaccess/source/core/api/KeySet.cxx | 11
dbaccess/source/core/api/OptimisticSet.cxx | 2
dbaccess/source/core/api/RowSet.cxx | 2
dbaccess/source/core/api/RowSetBase.cxx | 14
dbaccess/source/core/api/RowSetBase.hxx | 3
dbaccess/source/core/api/RowSetCache.cxx | 1
dbaccess/source/core/api/SingleSelectQueryComposer.cxx | 8
dbaccess/source/core/api/StaticSet.cxx | 1
dbaccess/source/core/api/TableDeco.cxx | 5
dbaccess/source/core/api/View.cxx | 6
dbaccess/source/core/api/WrappedResultSet.cxx | 1
dbaccess/source/core/api/column.cxx | 13
dbaccess/source/core/api/columnsettings.cxx | 9
dbaccess/source/core/api/datacolumn.cxx | 1
dbaccess/source/core/api/datasettings.cxx | 7
dbaccess/source/core/api/definitioncolumn.cxx | 26
dbaccess/source/core/api/preparedstatement.cxx | 1
dbaccess/source/core/api/query.cxx | 6
dbaccess/source/core/api/query.hxx | 11
dbaccess/source/core/api/querycomposer.cxx | 1
dbaccess/source/core/api/querycontainer.cxx | 6
dbaccess/source/core/api/querydescriptor.cxx | 4
dbaccess/source/core/api/querydescriptor.hxx | 9
dbaccess/source/core/api/resultcolumn.cxx | 1
dbaccess/source/core/api/resultset.cxx | 1
dbaccess/source/core/api/table.cxx | 6
dbaccess/source/core/api/tablecontainer.cxx | 7
dbaccess/source/core/api/viewcontainer.cxx | 5
dbaccess/source/core/dataaccess/ComponentDefinition.cxx | 9
dbaccess/source/core/dataaccess/ComponentDefinition.hxx | 9
dbaccess/source/core/dataaccess/ContentHelper.cxx | 11
dbaccess/source/core/dataaccess/ModelImpl.cxx | 14
dbaccess/source/core/dataaccess/ModelImpl.hxx | 13
dbaccess/source/core/dataaccess/SharedConnection.cxx | 1
dbaccess/source/core/dataaccess/SharedConnection.hxx | 11
dbaccess/source/core/dataaccess/bookmarkcontainer.cxx | 7
dbaccess/source/core/dataaccess/bookmarkcontainer.hxx | 8
dbaccess/source/core/dataaccess/commandcontainer.cxx | 6
dbaccess/source/core/dataaccess/commandcontainer.hxx | 5
dbaccess/source/core/dataaccess/commanddefinition.cxx | 7
dbaccess/source/core/dataaccess/commanddefinition.hxx | 10
dbaccess/source/core/dataaccess/connection.cxx | 10
dbaccess/source/core/dataaccess/connection.hxx | 12
dbaccess/source/core/dataaccess/dataaccessdescriptor.cxx | 11
dbaccess/source/core/dataaccess/databasecontext.cxx | 6
dbaccess/source/core/dataaccess/databasecontext.hxx | 10
dbaccess/source/core/dataaccess/databasedocument.cxx | 16
dbaccess/source/core/dataaccess/databasedocument.hxx | 12
dbaccess/source/core/dataaccess/databaseregistrations.cxx | 14
dbaccess/source/core/dataaccess/datasource.cxx | 17
dbaccess/source/core/dataaccess/datasource.hxx | 6
dbaccess/source/core/dataaccess/definitioncontainer.cxx | 12
dbaccess/source/core/dataaccess/documentcontainer.cxx | 16
dbaccess/source/core/dataaccess/documentcontainer.hxx | 4
dbaccess/source/core/dataaccess/documentdefinition.cxx | 43
dbaccess/source/core/dataaccess/documentdefinition.hxx | 8
dbaccess/source/core/dataaccess/documenteventexecutor.cxx | 10
dbaccess/source/core/dataaccess/documenteventexecutor.hxx | 4
dbaccess/source/core/dataaccess/documenteventnotifier.cxx | 14
dbaccess/source/core/dataaccess/documenteventnotifier.hxx | 4
dbaccess/source/core/dataaccess/documentevents.cxx | 14
dbaccess/source/core/dataaccess/documentevents.hxx | 4
dbaccess/source/core/dataaccess/intercept.cxx | 1
dbaccess/source/core/dataaccess/myucp_datasupplier.cxx | 21
dbaccess/source/core/dataaccess/myucp_resultset.cxx | 12
dbaccess/source/core/inc/FilteredContainer.hxx | 2
dbaccess/source/core/inc/PropertyForward.hxx | 4
dbaccess/source/core/inc/RefreshListener.hxx | 4
dbaccess/source/core/inc/TableDeco.hxx | 7
dbaccess/source/core/inc/View.hxx | 4
dbaccess/source/core/inc/column.hxx | 12
dbaccess/source/core/inc/columnsettings.hxx | 4
dbaccess/source/core/inc/commandbase.hxx | 6
dbaccess/source/core/inc/composertools.hxx | 13
dbaccess/source/core/inc/containerapprove.hxx | 4
dbaccess/source/core/inc/core_resource.hxx | 10
dbaccess/source/core/inc/datasettings.hxx | 18
dbaccess/source/core/inc/definitioncolumn.hxx | 25
dbaccess/source/core/inc/definitioncontainer.hxx | 6
dbaccess/source/core/inc/objectnameapproval.hxx | 4
dbaccess/source/core/inc/querycontainer.hxx | 4
dbaccess/source/core/inc/recovery/dbdocrecovery.hxx | 4
dbaccess/source/core/inc/table.hxx | 5
dbaccess/source/core/inc/tablecontainer.hxx | 6
dbaccess/source/core/inc/veto.hxx | 4
dbaccess/source/core/inc/viewcontainer.hxx | 5
dbaccess/source/core/misc/ContainerMediator.cxx | 18
dbaccess/source/core/misc/DatabaseDataProvider.cxx | 126
dbaccess/source/core/misc/PropertyForward.cxx | 11
dbaccess/source/core/misc/apitools.cxx | 17
dbaccess/source/core/misc/dsntypes.cxx | 71
dbaccess/source/core/misc/module_dba.cxx | 5
dbaccess/source/core/misc/objectnameapproval.cxx | 16
dbaccess/source/core/misc/sdbcoretools.cxx | 11
dbaccess/source/core/misc/services.cxx | 9
dbaccess/source/core/misc/userinformation.cxx | 2
dbaccess/source/core/misc/veto.cxx | 12
dbaccess/source/core/recovery/dbdocrecovery.cxx | 27
dbaccess/source/core/recovery/settingsimport.cxx | 39
dbaccess/source/core/recovery/settingsimport.hxx | 24
dbaccess/source/core/recovery/storagestream.cxx | 19
dbaccess/source/core/recovery/storagestream.hxx | 12
dbaccess/source/core/recovery/storagetextstream.cxx | 23
dbaccess/source/core/recovery/storagetextstream.hxx | 8
dbaccess/source/core/recovery/storagexmlstream.cxx | 32
dbaccess/source/core/recovery/storagexmlstream.hxx | 12
dbaccess/source/core/recovery/subcomponentloader.cxx | 26
dbaccess/source/core/recovery/subcomponentloader.hxx | 8
dbaccess/source/core/recovery/subcomponentrecovery.cxx | 48
dbaccess/source/core/recovery/subcomponentrecovery.hxx | 9
dbaccess/source/core/recovery/subcomponents.hxx | 8
dbaccess/source/core/resource/core_resource.cxx | 15
dbaccess/source/ext/macromigration/dbmm_module.cxx | 5
dbaccess/source/ext/macromigration/dbmm_module.hxx | 4
dbaccess/source/ext/macromigration/dbmm_services.cxx | 6
dbaccess/source/ext/macromigration/dbmm_types.cxx | 10
dbaccess/source/ext/macromigration/dbmm_types.hxx | 16
dbaccess/source/ext/macromigration/docinteraction.cxx | 17
dbaccess/source/ext/macromigration/docinteraction.hxx | 8
dbaccess/source/ext/macromigration/macromigrationdialog.cxx | 35
dbaccess/source/ext/macromigration/macromigrationdialog.hxx | 8
dbaccess/source/ext/macromigration/macromigrationpages.cxx | 53
dbaccess/source/ext/macromigration/macromigrationpages.hxx | 24
dbaccess/source/ext/macromigration/macromigrationwizard.cxx | 28
dbaccess/source/ext/macromigration/migrationengine.cxx | 104
dbaccess/source/ext/macromigration/migrationengine.hxx | 8
dbaccess/source/ext/macromigration/migrationerror.hxx | 8
dbaccess/source/ext/macromigration/migrationlog.cxx | 44
dbaccess/source/ext/macromigration/migrationlog.hxx | 10
dbaccess/source/ext/macromigration/migrationprogress.hxx | 8
dbaccess/source/ext/macromigration/progresscapture.cxx | 20
dbaccess/source/ext/macromigration/progresscapture.hxx | 8
dbaccess/source/ext/macromigration/progressmixer.cxx | 24
dbaccess/source/ext/macromigration/progressmixer.hxx | 12
dbaccess/source/ext/macromigration/rangeprogressbar.hxx | 13
dbaccess/source/filter/xml/dbloader2.cxx | 43
dbaccess/source/filter/xml/xmlAutoStyle.cxx | 7
dbaccess/source/filter/xml/xmlAutoStyle.hxx | 2
dbaccess/source/filter/xml/xmlColumn.cxx | 8
dbaccess/source/filter/xml/xmlColumn.hxx | 2
dbaccess/source/filter/xml/xmlComponent.cxx | 5
dbaccess/source/filter/xml/xmlComponent.hxx | 3
dbaccess/source/filter/xml/xmlConnectionData.cxx | 8
dbaccess/source/filter/xml/xmlConnectionData.hxx | 2
dbaccess/source/filter/xml/xmlConnectionResource.cxx | 5
dbaccess/source/filter/xml/xmlConnectionResource.hxx | 2
dbaccess/source/filter/xml/xmlDataSource.cxx | 7
dbaccess/source/filter/xml/xmlDataSource.hxx | 2
dbaccess/source/filter/xml/xmlDataSourceInfo.cxx | 5
dbaccess/source/filter/xml/xmlDataSourceInfo.hxx | 2
dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 15
dbaccess/source/filter/xml/xmlDataSourceSetting.hxx | 3
dbaccess/source/filter/xml/xmlDataSourceSettings.cxx | 9
dbaccess/source/filter/xml/xmlDataSourceSettings.hxx | 2
dbaccess/source/filter/xml/xmlDatabase.cxx | 9
dbaccess/source/filter/xml/xmlDatabase.hxx | 2
dbaccess/source/filter/xml/xmlDatabaseDescription.cxx | 8
dbaccess/source/filter/xml/xmlDatabaseDescription.hxx | 2
dbaccess/source/filter/xml/xmlDocuments.cxx | 11
dbaccess/source/filter/xml/xmlDocuments.hxx | 2
dbaccess/source/filter/xml/xmlEnums.hxx | 2
dbaccess/source/filter/xml/xmlExport.cxx | 103
dbaccess/source/filter/xml/xmlExport.hxx | 4
dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx | 5
dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx | 2
dbaccess/source/filter/xml/xmlHelper.cxx | 16
dbaccess/source/filter/xml/xmlHelper.hxx | 2
dbaccess/source/filter/xml/xmlHierarchyCollection.cxx | 12
dbaccess/source/filter/xml/xmlHierarchyCollection.hxx | 3
dbaccess/source/filter/xml/xmlLogin.cxx | 4
dbaccess/source/filter/xml/xmlLogin.hxx | 2
dbaccess/source/filter/xml/xmlQuery.cxx | 8
dbaccess/source/filter/xml/xmlQuery.hxx | 3
dbaccess/source/filter/xml/xmlServerDatabase.cxx | 4
dbaccess/source/filter/xml/xmlServerDatabase.hxx | 2
dbaccess/source/filter/xml/xmlStyleImport.cxx | 26
dbaccess/source/filter/xml/xmlStyleImport.hxx | 3
dbaccess/source/filter/xml/xmlTable.cxx | 14
dbaccess/source/filter/xml/xmlTable.hxx | 3
dbaccess/source/filter/xml/xmlTableFilterList.cxx | 8
dbaccess/source/filter/xml/xmlTableFilterList.hxx | 2
dbaccess/source/filter/xml/xmlTableFilterPattern.cxx | 5
dbaccess/source/filter/xml/xmlTableFilterPattern.hxx | 2
dbaccess/source/filter/xml/xmlfilter.cxx | 58
dbaccess/source/filter/xml/xmlfilter.hxx | 5
dbaccess/source/filter/xml/xmlservices.cxx | 3
dbaccess/source/inc/OAuthenticationContinuation.hxx | 5
dbaccess/source/inc/apitools.hxx | 67
dbaccess/source/inc/dsntypes.hxx | 16
dbaccess/source/inc/registrationhelper.hxx | 3
dbaccess/source/sdbtools/connection/connectiondependent.hxx | 13
dbaccess/source/sdbtools/connection/connectiontools.cxx | 23
dbaccess/source/sdbtools/connection/connectiontools.hxx | 8
dbaccess/source/sdbtools/connection/datasourcemetadata.cxx | 16
dbaccess/source/sdbtools/connection/datasourcemetadata.hxx | 9
dbaccess/source/sdbtools/connection/objectnames.cxx | 47
dbaccess/source/sdbtools/connection/objectnames.hxx | 8
dbaccess/source/sdbtools/connection/tablename.cxx | 27
dbaccess/source/sdbtools/connection/tablename.hxx | 8
dbaccess/source/sdbtools/inc/module_sdbt.hxx | 4
dbaccess/source/sdbtools/misc/module_sdbt.cxx | 5
dbaccess/source/sdbtools/misc/sdbt_services.cxx | 4
dbaccess/source/shared/registrationhelper.cxx | 6
dbaccess/source/ui/app/AppController.cxx | 122
dbaccess/source/ui/app/AppController.hxx | 10
dbaccess/source/ui/app/AppControllerDnD.cxx | 37
dbaccess/source/ui/app/AppControllerGen.cxx | 54
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 118
dbaccess/source/ui/app/AppDetailPageHelper.hxx | 3
dbaccess/source/ui/app/AppDetailView.cxx | 127
dbaccess/source/ui/app/AppDetailView.hxx | 2
dbaccess/source/ui/app/AppIconControl.cxx | 8
dbaccess/source/ui/app/AppIconControl.hxx | 2
dbaccess/source/ui/app/AppSwapWindow.cxx | 21
dbaccess/source/ui/app/AppSwapWindow.hxx | 5
dbaccess/source/ui/app/AppTitleWindow.cxx | 20
dbaccess/source/ui/app/AppTitleWindow.hxx | 3
dbaccess/source/ui/app/AppView.cxx | 101
dbaccess/source/ui/app/AppView.hxx | 4
dbaccess/source/ui/app/IApplicationController.hxx | 4
dbaccess/source/ui/app/subcomponentmanager.cxx | 37
dbaccess/source/ui/app/subcomponentmanager.hxx | 8
dbaccess/source/ui/browser/AsyncronousLink.cxx | 10
dbaccess/source/ui/browser/brwctrlr.cxx | 176
dbaccess/source/ui/browser/brwview.cxx | 34
dbaccess/source/ui/browser/dataview.cxx | 22
dbaccess/source/ui/browser/dbexchange.cxx | 11
dbaccess/source/ui/browser/dbloader.cxx | 19
dbaccess/source/ui/browser/dbtreemodel.cxx | 3
dbaccess/source/ui/browser/dbtreeview.cxx | 20
dbaccess/source/ui/browser/dbtreeview.hxx | 3
dbaccess/source/ui/browser/dsEntriesNoExp.cxx | 21
dbaccess/source/ui/browser/dsbrowserDnD.cxx | 17
dbaccess/source/ui/browser/exsrcbrw.cxx | 40
dbaccess/source/ui/browser/formadapter.cxx | 267
dbaccess/source/ui/browser/genericcontroller.cxx | 140
dbaccess/source/ui/browser/sbagrid.cxx | 95
dbaccess/source/ui/browser/sbamultiplex.cxx | 3
dbaccess/source/ui/browser/unodatbr.cxx | 146
dbaccess/source/ui/control/ColumnControlWindow.cxx | 32
dbaccess/source/ui/control/FieldDescControl.cxx | 101
dbaccess/source/ui/control/RelationControl.cxx | 42
dbaccess/source/ui/control/ScrollHelper.cxx | 9
dbaccess/source/ui/control/SqlNameEdit.cxx | 5
dbaccess/source/ui/control/TableGrantCtrl.cxx | 43
dbaccess/source/ui/control/VertSplitView.cxx | 17
dbaccess/source/ui/control/charsetlistbox.cxx | 11
dbaccess/source/ui/control/curledit.cxx | 18
dbaccess/source/ui/control/dbtreelistbox.cxx | 66
dbaccess/source/ui/control/listviewitems.cxx | 8
dbaccess/source/ui/control/opendoccontrols.cxx | 24
dbaccess/source/ui/control/tabletree.cxx | 38
dbaccess/source/ui/control/toolboxcontroller.cxx | 16
dbaccess/source/ui/control/undosqledit.cxx | 5
dbaccess/source/ui/dlg/CollectionView.cxx | 25
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 32
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 6
dbaccess/source/ui/dlg/ConnectionPage.cxx | 17
dbaccess/source/ui/dlg/ConnectionPage.hxx | 9
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 21
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 13
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 104
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 53
dbaccess/source/ui/dlg/DbAdminImpl.cxx | 64
dbaccess/source/ui/dlg/DbAdminImpl.hxx | 9
dbaccess/source/ui/dlg/RelationDlg.cxx | 20
dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 31
dbaccess/source/ui/dlg/TextConnectionHelper.hxx | 10
dbaccess/source/ui/dlg/UserAdmin.cxx | 26
dbaccess/source/ui/dlg/UserAdminDlg.cxx | 22
dbaccess/source/ui/dlg/admincontrols.cxx | 29
dbaccess/source/ui/dlg/admincontrols.hxx | 8
dbaccess/source/ui/dlg/adminpages.cxx | 34
dbaccess/source/ui/dlg/adminpages.hxx | 18
dbaccess/source/ui/dlg/adodatalinks.cxx | 2
dbaccess/source/ui/dlg/adtabdlg.cxx | 4
dbaccess/source/ui/dlg/advancedsettings.cxx | 47
dbaccess/source/ui/dlg/advancedsettings.hxx | 12
dbaccess/source/ui/dlg/dbadmin.cxx | 44
dbaccess/source/ui/dlg/dbfindex.cxx | 2
dbaccess/source/ui/dlg/dbfindex.hxx | 15
dbaccess/source/ui/dlg/dbwiz.cxx | 43
dbaccess/source/ui/dlg/dbwizsetup.cxx | 72
dbaccess/source/ui/dlg/detailpages.cxx | 105
dbaccess/source/ui/dlg/detailpages.hxx | 51
dbaccess/source/ui/dlg/directsql.cxx | 25
dbaccess/source/ui/dlg/dlgattr.cxx | 4
dbaccess/source/ui/dlg/dlgsave.cxx | 24
dbaccess/source/ui/dlg/dlgsize.cxx | 13
dbaccess/source/ui/dlg/dsnItem.hxx | 12
dbaccess/source/ui/dlg/dsselect.cxx | 11
dbaccess/source/ui/dlg/dsselect.hxx | 8
dbaccess/source/ui/dlg/finteraction.cxx | 12
dbaccess/source/ui/dlg/finteraction.hxx | 8
dbaccess/source/ui/dlg/generalpage.cxx | 85
dbaccess/source/ui/dlg/generalpage.hxx | 42
dbaccess/source/ui/dlg/indexdialog.cxx | 52
dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 35
dbaccess/source/ui/dlg/odbcconfig.cxx | 38
dbaccess/source/ui/dlg/odbcconfig.hxx | 16
dbaccess/source/ui/dlg/optionalboolitem.cxx | 13
dbaccess/source/ui/dlg/optionalboolitem.hxx | 8
dbaccess/source/ui/dlg/paramdialog.cxx | 22
dbaccess/source/ui/dlg/queryfilter.cxx | 1
dbaccess/source/ui/dlg/queryorder.cxx | 1
dbaccess/source/ui/dlg/sqlmessage.cxx | 37
dbaccess/source/ui/dlg/tablespage.cxx | 28
dbaccess/source/ui/dlg/tablespage.hxx | 11
dbaccess/source/ui/dlg/textconnectionsettings.cxx | 12
dbaccess/source/ui/inc/AppElementType.hxx | 4
dbaccess/source/ui/inc/CollectionView.hxx | 6
dbaccess/source/ui/inc/ColumnControlWindow.hxx | 6
dbaccess/source/ui/inc/ConnectionLine.hxx | 2
dbaccess/source/ui/inc/ConnectionLineData.hxx | 6
dbaccess/source/ui/inc/FieldControls.hxx | 7
dbaccess/source/ui/inc/GeneralUndo.hxx | 2
dbaccess/source/ui/inc/JoinController.hxx | 8
dbaccess/source/ui/inc/RTableConnectionData.hxx | 4
dbaccess/source/ui/inc/RefFunctor.hxx | 2
dbaccess/source/ui/inc/RelationControl.hxx | 1
dbaccess/source/ui/inc/RelationDlg.hxx | 4
dbaccess/source/ui/inc/SqlNameEdit.hxx | 2
dbaccess/source/ui/inc/TableCopyHelper.hxx | 4
dbaccess/source/ui/inc/TableDesignView.hxx | 3
dbaccess/source/ui/inc/TableWindow.hxx | 2
dbaccess/source/ui/inc/TablesSingleDlg.hxx | 8
dbaccess/source/ui/inc/TokenWriter.hxx | 17
dbaccess/source/ui/inc/TypeInfo.hxx | 6
dbaccess/source/ui/inc/UITools.hxx | 5
dbaccess/source/ui/inc/UserAdminDlg.hxx | 8
dbaccess/source/ui/inc/VertSplitView.hxx | 1
dbaccess/source/ui/inc/WCPage.hxx | 3
dbaccess/source/ui/inc/WColumnSelect.hxx | 7
dbaccess/source/ui/inc/WCopyTable.hxx | 8
dbaccess/source/ui/inc/WExtendPages.hxx | 8
dbaccess/source/ui/inc/WNameMatch.hxx | 6
dbaccess/source/ui/inc/WTabPage.hxx | 4
dbaccess/source/ui/inc/WTypeSelect.hxx | 10
dbaccess/source/ui/inc/adtabdlg.hxx | 3
dbaccess/source/ui/inc/advancedsettingsdlg.hxx | 8
dbaccess/source/ui/inc/asyncmodaldialog.hxx | 8
dbaccess/source/ui/inc/brwctrlr.hxx | 7
dbaccess/source/ui/inc/brwview.hxx | 2
dbaccess/source/ui/inc/callbacks.hxx | 16
dbaccess/source/ui/inc/charsetlistbox.hxx | 8
dbaccess/source/ui/inc/charsets.hxx | 12
dbaccess/source/ui/inc/commontypes.hxx | 4
dbaccess/source/ui/inc/curledit.hxx | 9
dbaccess/source/ui/inc/databaseobjectview.hxx | 22
dbaccess/source/ui/inc/datasourceconnector.hxx | 8
dbaccess/source/ui/inc/dbadmin.hxx | 8
dbaccess/source/ui/inc/dbtreelistbox.hxx | 3
dbaccess/source/ui/inc/dbwiz.hxx | 8
dbaccess/source/ui/inc/dbwizsetup.hxx | 10
dbaccess/source/ui/inc/defaultobjectnamecheck.hxx | 12
dbaccess/source/ui/inc/directsql.hxx | 9
dbaccess/source/ui/inc/dlgattr.hxx | 7
dbaccess/source/ui/inc/dlgsize.hxx | 4
dbaccess/source/ui/inc/dsitems.hxx | 7
dbaccess/source/ui/inc/dsmeta.hxx | 18
dbaccess/source/ui/inc/exsrcbrw.hxx | 4
dbaccess/source/ui/inc/formadapter.hxx | 2
dbaccess/source/ui/inc/imageprovider.hxx | 8
dbaccess/source/ui/inc/indexcollection.hxx | 9
dbaccess/source/ui/inc/indexdialog.hxx | 12
dbaccess/source/ui/inc/indexes.hxx | 14
dbaccess/source/ui/inc/indexfieldscontrol.hxx | 6
dbaccess/source/ui/inc/linkeddocuments.hxx | 8
dbaccess/source/ui/inc/listviewitems.hxx | 8
dbaccess/source/ui/inc/localresaccess.hxx | 8
dbaccess/source/ui/inc/marktree.hxx | 9
dbaccess/source/ui/inc/moduledbu.hxx | 16
dbaccess/source/ui/inc/objectnamecheck.hxx | 8
dbaccess/source/ui/inc/opendoccontrols.hxx | 12
dbaccess/source/ui/inc/paramdialog.hxx | 9
dbaccess/source/ui/inc/propertysetitem.hxx | 8
dbaccess/source/ui/inc/propertystorage.hxx | 12
dbaccess/source/ui/inc/querycontainerwindow.hxx | 12
dbaccess/source/ui/inc/queryfilter.hxx | 3
dbaccess/source/ui/inc/queryorder.hxx | 4
dbaccess/source/ui/inc/sbagrid.hxx | 13
dbaccess/source/ui/inc/sbamultiplex.hxx | 27
dbaccess/source/ui/inc/singledoccontroller.hxx | 8
dbaccess/source/ui/inc/sqlmessage.hxx | 10
dbaccess/source/ui/inc/stringlistitem.hxx | 8
dbaccess/source/ui/inc/tabletree.hxx | 8
dbaccess/source/ui/inc/textconnectionsettings.hxx | 8
dbaccess/source/ui/inc/toolboxcontroller.hxx | 2
dbaccess/source/ui/inc/undosqledit.hxx | 3
dbaccess/source/ui/inc/unoadmin.hxx | 8
dbaccess/source/ui/inc/unodatbr.hxx | 9
dbaccess/source/ui/inc/unosqlmessage.hxx | 4
dbaccess/source/ui/misc/DExport.cxx | 31
dbaccess/source/ui/misc/HtmlReader.cxx | 27
dbaccess/source/ui/misc/ModuleHelper.cxx | 4
dbaccess/source/ui/misc/RowSetDrop.cxx | 12
dbaccess/source/ui/misc/RtfReader.cxx | 19
dbaccess/source/ui/misc/TableCopyHelper.cxx | 19
dbaccess/source/ui/misc/TokenWriter.cxx | 54
dbaccess/source/ui/misc/ToolBoxHelper.cxx | 7
dbaccess/source/ui/misc/UITools.cxx | 78
dbaccess/source/ui/misc/WCPage.cxx | 23
dbaccess/source/ui/misc/WColumnSelect.cxx | 32
dbaccess/source/ui/misc/WCopyTable.cxx | 127
dbaccess/source/ui/misc/WExtendPages.cxx | 10
dbaccess/source/ui/misc/WNameMatch.cxx | 43
dbaccess/source/ui/misc/WTypeSelect.cxx | 57
dbaccess/source/ui/misc/asyncmodaldialog.cxx | 16
dbaccess/source/ui/misc/charsets.cxx | 32
dbaccess/source/ui/misc/controllerframe.cxx | 44
dbaccess/source/ui/misc/databaseobjectview.cxx | 40
dbaccess/source/ui/misc/datasourceconnector.cxx | 13
dbaccess/source/ui/misc/dbaundomanager.cxx | 56
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 52
dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 31
dbaccess/source/ui/misc/dsmeta.cxx | 24
dbaccess/source/ui/misc/imageprovider.cxx | 23
dbaccess/source/ui/misc/indexcollection.cxx | 26
dbaccess/source/ui/misc/linkeddocuments.cxx | 22
dbaccess/source/ui/misc/moduledbu.cxx | 20
dbaccess/source/ui/misc/propertysetitem.cxx | 14
dbaccess/source/ui/misc/propertystorage.cxx | 20
dbaccess/source/ui/misc/singledoccontroller.cxx | 22
dbaccess/source/ui/misc/stringlistitem.cxx | 13
dbaccess/source/ui/misc/uiservices.cxx | 3
dbaccess/source/ui/querydesign/ConnectionLine.cxx | 43
dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx | 33
dbaccess/source/ui/querydesign/ConnectionLineData.cxx | 14
dbaccess/source/ui/querydesign/JAccess.cxx | 15
dbaccess/source/ui/querydesign/JoinController.cxx | 50
dbaccess/source/ui/querydesign/JoinDesignView.cxx | 20
dbaccess/source/ui/querydesign/JoinExchange.cxx | 16
dbaccess/source/ui/querydesign/JoinTableView.cxx | 138
dbaccess/source/ui/querydesign/QTableConnection.cxx | 9
dbaccess/source/ui/querydesign/QTableConnection.hxx | 1
dbaccess/source/ui/querydesign/QTableConnectionData.cxx | 17
dbaccess/source/ui/querydesign/QTableWindow.cxx | 16
dbaccess/source/ui/querydesign/QTableWindow.hxx | 2
dbaccess/source/ui/querydesign/QTableWindowData.cxx | 9
dbaccess/source/ui/querydesign/QueryAddTabConnUndoAction.hxx | 3
dbaccess/source/ui/querydesign/QueryDesignFieldUndoAct.hxx | 11
dbaccess/source/ui/querydesign/QueryDesignUndoAction.hxx | 1
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 130
dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.cxx | 3
dbaccess/source/ui/querydesign/QueryMoveTabWinUndoAct.hxx | 3
dbaccess/source/ui/querydesign/QuerySizeTabWinUndoAct.hxx | 4
dbaccess/source/ui/querydesign/QueryTabConnUndoAction.cxx | 31
dbaccess/source/ui/querydesign/QueryTabWinShowUndoAct.hxx | 4
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.cxx | 13
dbaccess/source/ui/querydesign/QueryTabWinUndoAct.hxx | 5
dbaccess/source/ui/querydesign/QueryTableView.cxx | 57
dbaccess/source/ui/querydesign/QueryTextView.cxx | 31
dbaccess/source/ui/querydesign/QueryViewSwitch.cxx | 54
dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 148
dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx | 5
dbaccess/source/ui/querydesign/TableConnection.cxx | 30
dbaccess/source/ui/querydesign/TableConnectionData.cxx | 27
dbaccess/source/ui/querydesign/TableFieldDescription.cxx | 19
dbaccess/source/ui/querydesign/TableFieldInfo.cxx | 7
dbaccess/source/ui/querydesign/TableWindow.cxx | 76
dbaccess/source/ui/querydesign/TableWindowAccess.cxx | 26
dbaccess/source/ui/querydesign/TableWindowData.cxx | 13
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 26
dbaccess/source/ui/querydesign/TableWindowTitle.cxx | 15
dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 23
dbaccess/source/ui/querydesign/querycontroller.cxx | 86
dbaccess/source/ui/querydesign/querydlg.cxx | 22
dbaccess/source/ui/querydesign/queryview.cxx | 8
dbaccess/source/ui/relationdesign/RTableConnection.cxx | 12
dbaccess/source/ui/relationdesign/RTableConnection.hxx | 4
dbaccess/source/ui/relationdesign/RTableConnectionData.cxx | 31
dbaccess/source/ui/relationdesign/RelationController.cxx | 50
dbaccess/source/ui/relationdesign/RelationDesignView.cxx | 17
dbaccess/source/ui/relationdesign/RelationTableView.cxx | 30
dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 44
dbaccess/source/ui/tabledesign/FieldDescGenWin.hxx | 1
dbaccess/source/ui/tabledesign/FieldDescriptions.cxx | 83
dbaccess/source/ui/tabledesign/TEditControl.cxx | 165
dbaccess/source/ui/tabledesign/TEditControl.hxx | 3
dbaccess/source/ui/tabledesign/TableController.cxx | 82
dbaccess/source/ui/tabledesign/TableDesignControl.cxx | 14
dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx | 21
dbaccess/source/ui/tabledesign/TableDesignView.cxx | 51
dbaccess/source/ui/tabledesign/TableFieldControl.cxx | 29
dbaccess/source/ui/tabledesign/TableFieldControl.hxx | 3
dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx | 38
dbaccess/source/ui/tabledesign/TableFieldDescWin.hxx | 4
dbaccess/source/ui/tabledesign/TableRow.cxx | 19
dbaccess/source/ui/tabledesign/TableRowExchange.cxx | 5
dbaccess/source/ui/tabledesign/TableUndo.cxx | 61
dbaccess/source/ui/tabledesign/TableUndo.hxx | 10
dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 21
dbaccess/source/ui/uno/ColumnControl.cxx | 12
dbaccess/source/ui/uno/ColumnControl.hxx | 2
dbaccess/source/ui/uno/ColumnModel.cxx | 25
dbaccess/source/ui/uno/ColumnModel.hxx | 7
dbaccess/source/ui/uno/ColumnPeer.cxx | 15
dbaccess/source/ui/uno/ColumnPeer.hxx | 5
dbaccess/source/ui/uno/DBTypeWizDlg.cxx | 19
dbaccess/source/ui/uno/DBTypeWizDlg.hxx | 8
dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 21
dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 8
dbaccess/source/ui/uno/TableFilterDlg.cxx | 20
dbaccess/source/ui/uno/TableFilterDlg.hxx | 8
dbaccess/source/ui/uno/UserSettingsDlg.cxx | 20
dbaccess/source/ui/uno/UserSettingsDlg.hxx | 8
dbaccess/source/ui/uno/admindlg.cxx | 20
dbaccess/source/ui/uno/admindlg.hxx | 8
dbaccess/source/ui/uno/composerdialogs.cxx | 33
dbaccess/source/ui/uno/composerdialogs.hxx | 17
dbaccess/source/ui/uno/copytablewizard.cxx | 64
dbaccess/source/ui/uno/dbinteraction.cxx | 30
dbaccess/source/ui/uno/dbinteraction.hxx | 16
dbaccess/source/ui/uno/textconnectionsettings_uno.cxx | 25
dbaccess/source/ui/uno/unoDirectSql.cxx | 17
dbaccess/source/ui/uno/unoDirectSql.hxx | 8
dbaccess/source/ui/uno/unoadmin.cxx | 12
dbaccess/source/ui/uno/unosqlmessage.cxx | 19
desktop/win32/source/guistdio/guistdio.inc | 4
download.lst | 6
drawinglayer/source/dumper/XShapeDumper.cxx | 17
drawinglayer/source/processor2d/vclprocessor2d.cxx | 24
editeng/Library_editeng.mk | 3
editeng/qa/unit/core-test.cxx | 150
editeng/source/editeng/editdoc.cxx | 42
editeng/source/editeng/editdoc.hxx | 9
editeng/source/editeng/editeng.cxx | 28
editeng/source/editeng/editobj.cxx | 84
editeng/source/editeng/editobj2.hxx | 17
editeng/source/editeng/editview.cxx | 3
editeng/source/editeng/edtspell.cxx | 275
editeng/source/editeng/edtspell.hxx | 72
editeng/source/editeng/impedit.hxx | 14
editeng/source/editeng/impedit2.cxx | 50
editeng/source/editeng/impedit3.cxx | 11
editeng/source/editeng/impedit4.cxx | 55
editeng/source/editeng/impedit5.cxx | 10
editeng/source/editeng/misspellrange.cxx | 19
editeng/source/editeng/section.cxx | 21
editeng/source/editeng/sectionattribute.cxx | 21
editeng/source/items/borderline.cxx | 2
editeng/source/items/bulitem.cxx | 2
editeng/source/items/numitem.cxx | 11
editeng/source/misc/acorrcfg.cxx | 15
editeng/source/misc/svxacorr.cxx | 2
embeddedobj/Module_embeddedobj.mk | 2
extensions/Module_extensions.mk | 8
extras/source/glade/libreoffice-catalog.xml.in | 3
filter/qa/cppunit/data/tiff/pass/CVE-2013-5575-1.tiff |binary
firebird/ExternalPackage_firebird.mk | 13
firebird/ExternalProject_firebird.mk | 13
firebird/UnpackedTarball_firebird.mk | 1
firebird/firebird-macosx.patch.1 | 156
firebird/firebird-rpath.patch.0 | 11
formula/source/core/api/FormulaCompiler.cxx | 4
framework/source/fwe/helper/propertysetcontainer.cxx | 8
framework/source/fwi/uielement/itemcontainer.cxx | 8
framework/source/fwi/uielement/rootitemcontainer.cxx | 8
framework/source/uielement/togglebuttontoolbarcontroller.cxx | 8
graphite/UnpackedTarball_graphite.mk | 1
graphite/graphite2.issue1030.patch.1 | 12
helpcontent2 | 2
i18nlangtag/CppunitTest_i18nlangtag_test_languagetag.mk | 2
i18nlangtag/Library_i18nlangtag.mk | 2
i18nlangtag/qa/cppunit/test_languagetag.cxx | 64
i18nlangtag/source/isolang/isolang.cxx | 385
i18nlangtag/source/isolang/mslangid.cxx | 22
i18nlangtag/source/languagetag/languagetag.cxx | 125
i18nlangtag/source/languagetag/simple-langtag.cxx | 190
icon-themes/galaxy/sw/res/page-shadow-mask.png |binary
idlc/source/parser.y | 4386 +++++-----
include/basebmp/packedpixeliterator.hxx | 2
include/basebmp/polypolygonrenderer.hxx | 2
include/editeng/borderline.hxx | 2
include/editeng/bulletitem.hxx | 2
include/editeng/editeng.hxx | 16
include/editeng/editobj.hxx | 14
include/editeng/misspellrange.hxx | 30
include/editeng/section.hxx | 37
include/editeng/sectionattribute.hxx | 37
include/editeng/unoprnms.hxx | 1
include/formula/grammar.hxx | 1
include/i18nlangtag/lang.h | 9
include/i18nlangtag/languagetag.hxx | 11
include/i18nlangtag/mslangid.hxx | 6
include/osl/profile.hxx | 12
include/sal/log-areas.dox | 2
include/sfx2/app.hxx | 18
include/sfx2/basedlgs.hxx | 6
include/sfx2/bindings.hxx | 2
include/sfx2/childwin.hxx | 8
include/sfx2/controlwrapper.hxx | 4
include/sfx2/dinfdlg.hxx | 4
include/sfx2/dispatch.hxx | 6
include/sfx2/docfac.hxx | 14
include/sfx2/docfile.hxx | 10
include/sfx2/docfilt.hxx | 10
include/sfx2/docinsert.hxx | 8
include/sfx2/doctempl.hxx | 22
include/sfx2/event.hxx | 14
include/sfx2/evntconf.hxx | 10
include/sfx2/fcontnr.hxx | 22
include/sfx2/filedlghelper.hxx | 46
include/sfx2/frame.hxx | 2
include/sfx2/frmdescr.hxx | 14
include/sfx2/frmhtml.hxx | 3
include/sfx2/frmhtmlw.hxx | 12
include/sfx2/linkmgr.hxx | 42
include/sfx2/linksrc.hxx | 10
include/sfx2/lnkbase.hxx | 18
include/sfx2/macropg.hxx | 12
include/sfx2/mailmodelapi.hxx | 16
include/sfx2/mgetempl.hxx | 10
include/sfx2/mieclip.hxx | 4
include/sfx2/minfitem.hxx | 34
include/sfx2/mnuitem.hxx | 16
include/sfx2/msgpool.hxx | 4
include/sfx2/new.hxx | 2
include/sfx2/newstyle.hxx | 2
include/sfx2/objface.hxx | 20
include/sfx2/objsh.hxx | 48
include/sfx2/opengrf.hxx | 12
include/sfx2/passwd.hxx | 18
include/sfx2/printer.hxx | 4
include/sfx2/progress.hxx | 8
include/sfx2/request.hxx | 1
include/sfx2/sfxbasemodel.hxx | 2
include/sfx2/sfxdlg.hxx | 18
include/sfx2/sfxhtml.hxx | 14
include/sfx2/sfxsids.hrc | 2
include/sfx2/shell.hxx | 4
include/sfx2/styfitem.hxx | 12
include/sfx2/tabdlg.hxx | 20
include/sfx2/templateabstractview.hxx | 2
include/sfx2/templatelocalview.hxx | 1
include/sfx2/templdlg.hxx | 2
include/svl/solar.hrc | 2
include/svtools/ruler.hxx | 385
include/svx/hlnkitem.hxx | 6
include/svx/imapdlg.hxx | 2
include/svx/nbdtmg.hxx | 2
include/svx/nbdtmgfact.hxx | 14
include/svx/ruler.hxx | 179
include/svx/svdobj.hxx | 10
include/svx/svdotext.hxx | 4
include/svx/svxdlg.hxx | 4
include/svx/unoshprp.hxx | 4
include/tools/rc.h | 3
include/tools/rcid.h | 2
include/tools/string.hxx | 2
include/unotools/ucbhelper.hxx | 18
include/vcl/bitmapex.hxx | 23
include/vcl/bmpacc.hxx | 10
include/vcl/button.hxx | 1
ios/.DS_Store |binary
ios/iosremote/.DS_Store |binary
ios/iosremote/UserDefaults.plist | 2
ios/iosremote/WalkThroughContainerViewController.h | 15
ios/iosremote/WalkThroughContainerViewController.m | 114
ios/iosremote/en.lproj/iPad_autosize.storyboard | 98
ios/iosremote/en.lproj/iPad_autosize.strings |binary
ios/iosremote/en.lproj/iPad_autosize_old.storyboard | 98
ios/iosremote/fr.lproj/iPad_autosize.storyboard | 100
ios/iosremote/fr.lproj/iPad_autosize.strings |binary
ios/iosremote/fr.lproj/iPad_autosize_old.storyboard | 96
ios/iosremote/iosremote.xcodeproj/project.pbxproj | 68
ios/iosremote/iosremote.xcodeproj/project.xcworkspace/xcshareddata/iosremote.xccheckout | 41
ios/iosremote/iosremote.xcodeproj/xcuserdata/me.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist | 2
ios/iosremote/iosremote/.DS_Store |binary
ios/iosremote/iosremote/AppDelegate.m | 10
ios/iosremote/iosremote/BasePresentationViewController.h | 5
ios/iosremote/iosremote/BasePresentationViewController.m | 9
ios/iosremote/iosremote/Communication/CommunicationManager.m | 1
ios/iosremote/iosremote/ControlVariables.h | 4
ios/iosremote/iosremote/WTConnectionHotspot.png |binary
ios/iosremote/iosremote/WTPairing.png |binary
ios/iosremote/iosremote/WTPairingScreenshot.png |binary
ios/iosremote/iosremote/WTconnecting.png |binary
ios/iosremote/iosremote/WTconnection.png |binary
ios/iosremote/iosremote/WTcontrol.png |binary
ios/iosremote/iosremote/WalkThroughPageViewController.h | 22
ios/iosremote/iosremote/WalkThroughPageViewController.m | 84
ios/iosremote/iosremote/WalkThroughPageViewController.xib | 520 +
ios/iosremote/iosremote/WalkThroughPageViewMainImageController.xib | 391
ios/iosremote/iosremote/add.png |binary
ios/iosremote/iosremote/add at 2x.png |binary
ios/iosremote/iosremote/backButton.png |binary
ios/iosremote/iosremote/backButton at 2x.png |binary
ios/iosremote/iosremote/buttonBackground.png |binary
ios/iosremote/iosremote/buttonBackground at 2x.png |binary
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard | 160
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings |binary
ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard | 160
ios/iosremote/iosremote/forwardButton.png |binary
ios/iosremote/iosremote/forwardButton at 2x.png |binary
ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard | 160
ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.strings |binary
ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard | 160
ios/iosremote/iosremote/gear_transparent_bg.png |binary
ios/iosremote/iosremote/gear_transparent_bg at 2x.png |binary
ios/iosremote/iosremote/more_icon.png |binary
ios/iosremote/iosremote/more_icon at 2x.png |binary
ios/iosremote/iosremote/pointer.png |binary
ios/iosremote/iosremote/pointer_pushed.png |binary
ios/iosremote/iosremote/pushed_next_button.png |binary
ios/iosremote/iosremote/pushed_previous_button.png |binary
ios/iosremote/iosremote/released_next_button.png |binary
ios/iosremote/iosremote/released_previous_button.png |binary
ios/iosremote/iosremote/serverList_vc.m | 30
ios/iosremote/iosremote/slideShowPreviewTable_vc.m | 9
ios/iosremote/iosremote/slideShow_vc_iphone.m | 2
ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard | 160
ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.strings |binary
ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard | 160
ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard | 98
ios/iosremote/zh-Hans.lproj/iPad_autosize.strings |binary
ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard | 94
javaunohelper/Jar_juh.mk | 1
javaunohelper/com/sun/star/comp/helper/UnoInfo.java | 107
jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml | 8
jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml | 12
jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml | 6
jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml | 2
jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml | 4
jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml | 6
liblangtag/Module_liblangtag.mk | 2
librelogo/source/ChangeLog | 15
librelogo/source/LibreLogo/LibreLogo.py | 69
libvisio/UnpackedTarball_libvisio.mk | 5
libvisio/libvisio-0.0.30-msvc.patch.1 | 12
libvisio/libvisio-wpx_seek_end.patch.1 | 14
np_sdk/Module_np_sdk.mk | 4
odk/Package_javadoc.mk | 2
odk/source/com/sun/star/lib/loader/Loader.java | 50
offapi/com/sun/star/drawing/Shape.idl | 13
oox/source/drawingml/graphicshapecontext.cxx | 15
oox/source/drawingml/shape.cxx | 32
package/source/xstor/ohierarchyholder.cxx | 3
package/source/xstor/xfactory.cxx | 2
postprocess/Rdb_services.mk | 4
python3/ExternalProject_python3.mk | 6
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv | 1
qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv | 1
qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv | 1
qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv | 1
qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXShape.csv | 1
qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxGraphicObject.csv | 1
qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShape.csv | 1
qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeCircle.csv | 1
qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeConnector.csv | 1
qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeControl.csv | 1
qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeDimensioning.csv | 1
qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeGroup.csv | 1
qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygon.csv | 1
qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygonBezier.csv | 1
qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXShape.csv | 1
qadevOOo/tests/java/mod/_sc/ScAccessiblePageHeader.java | 34
registry/tools/fileurl.cxx | 2
registry/tools/fileurl.hxx | 2
rsc/inc/rscdb.hxx | 1
rsc/source/parser/rscicpx.cxx | 19
rsc/source/parser/rscinit.cxx | 6
sal/osl/w32/security.c | 4
sal/rtl/alloc_arena.cxx | 8
sal/rtl/alloc_cache.cxx | 6
sal/textenc/textenc.cxx | 3
sc/inc/address.hxx | 17
sc/inc/arealink.hxx | 36
sc/inc/document.hxx | 9
sc/inc/externalrefmgr.hxx | 2
sc/inc/rangeseq.hxx | 2
sc/inc/scmatrix.hxx | 2
sc/inc/tablink.hxx | 2
sc/qa/unit/subsequent_export-test.cxx | 190
sc/qa/unit/ucalc.cxx | 9
sc/qa/unit/ucalc_pivottable.cxx | 8
sc/qa/unit/ucalc_sharedformula.cxx | 3
sc/sdi/formatsh.sdi | 2
sc/source/core/data/attrib.cxx | 4
sc/source/core/data/column2.cxx | 24
sc/source/core/data/documen2.cxx | 27
sc/source/core/data/documen3.cxx | 2
sc/source/core/data/documen8.cxx | 29
sc/source/core/data/dpcache.cxx | 4
sc/source/core/data/fillinfo.cxx | 26
sc/source/core/data/formulacell.cxx | 10
sc/source/core/data/validat.cxx | 8
sc/source/core/inc/ddelink.hxx | 2
sc/source/core/tool/address.cxx | 98
sc/source/core/tool/chartarr.cxx | 10
sc/source/core/tool/chgtrack.cxx | 6
sc/source/core/tool/ddelink.cxx | 16
sc/source/core/tool/interpr1.cxx | 50
sc/source/core/tool/interpr2.cxx | 12
sc/source/core/tool/rangelst.cxx | 3
sc/source/core/tool/rangeseq.cxx | 6
sc/source/core/tool/rangeutl.cxx | 23
sc/source/core/tool/reffind.cxx | 2
sc/source/core/tool/scmatrix.cxx | 136
sc/source/filter/excel/xename.cxx | 3
sc/source/filter/excel/xestream.cxx | 8
sc/source/filter/excel/xicontent.cxx | 4
sc/source/filter/excel/xlstyle.cxx | 4
sc/source/filter/inc/xicontent.hxx | 4
sc/source/filter/xml/XMLExportIterator.cxx | 13
sc/source/filter/xml/XMLExportIterator.hxx | 9
sc/source/filter/xml/xmlcelli.cxx | 20
sc/source/filter/xml/xmlcelli.hxx | 2
sc/source/filter/xml/xmlexprt.cxx | 80
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 3
sc/source/ui/Accessibility/AccessibleDocument.cxx | 3
sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx | 4
sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx | 42
sc/source/ui/StatisticsDialogs/CorrelationDialog.cxx | 6
sc/source/ui/StatisticsDialogs/CovarianceDialog.cxx | 6
sc/source/ui/StatisticsDialogs/DescriptiveStatisticsDialog.cxx | 2
sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx | 6
sc/source/ui/StatisticsDialogs/SamplingDialog.cxx | 7
sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx | 9
sc/source/ui/app/inputhdl.cxx | 26
sc/source/ui/app/inputwin.cxx | 5
sc/source/ui/cctrl/checklistmenu.cxx | 7
sc/source/ui/condformat/condformatdlg.cxx | 3
sc/source/ui/dbgui/asciiopt.cxx | 61
sc/source/ui/dbgui/consdlg.cxx | 23
sc/source/ui/dbgui/dbnamdlg.cxx | 8
sc/source/ui/dbgui/filtdlg.cxx | 3
sc/source/ui/dbgui/foptmgr.cxx | 16
sc/source/ui/dbgui/imoptdlg.cxx | 3
sc/source/ui/dbgui/pfiltdlg.cxx | 3
sc/source/ui/dbgui/pvlaydlg.cxx | 20
sc/source/ui/dbgui/sfiltdlg.cxx | 9
sc/source/ui/dbgui/tpsort.cxx | 12
sc/source/ui/dbgui/validate.cxx | 3
sc/source/ui/docshell/arealink.cxx | 32
sc/source/ui/docshell/docfunc.cxx | 7
sc/source/ui/docshell/docsh.cxx | 4
sc/source/ui/docshell/docsh4.cxx | 24
sc/source/ui/docshell/docsh8.cxx | 13
sc/source/ui/docshell/externalrefmgr.cxx | 4
sc/source/ui/docshell/impex.cxx | 10
sc/source/ui/docshell/servobj.cxx | 2
sc/source/ui/docshell/tablink.cxx | 2
sc/source/ui/drawfunc/fuins2.cxx | 2
sc/source/ui/formdlg/dwfunctr.cxx | 35
sc/source/ui/formdlg/formula.cxx | 3
sc/source/ui/inc/asciiopt.hxx | 13
sc/source/ui/inc/checklistmenu.hxx | 1
sc/source/ui/inc/docfunc.hxx | 4
sc/source/ui/inc/docsh.hxx | 6
sc/source/ui/inc/gridwin.hxx | 3
sc/source/ui/inc/navipi.hxx | 6
sc/source/ui/inc/output.hxx | 2
sc/source/ui/inc/servobj.hxx | 2
sc/source/ui/inc/tabview.hxx | 2
sc/source/ui/inc/undoblk.hxx | 24
sc/source/ui/inc/viewfunc.hxx | 2
sc/source/ui/miscdlgs/acredlin.cxx | 44
sc/source/ui/miscdlgs/crnrdlg.cxx | 23
sc/source/ui/miscdlgs/highred.cxx | 6
sc/source/ui/miscdlgs/optsolver.cxx | 6
sc/source/ui/miscdlgs/simpref.cxx | 4
sc/source/ui/miscdlgs/solvrdlg.cxx | 7
sc/source/ui/miscdlgs/tabopdlg.cxx | 8
sc/source/ui/namedlg/namedefdlg.cxx | 10
sc/source/ui/namedlg/namedlg.cxx | 5
sc/source/ui/navipi/content.cxx | 9
sc/source/ui/navipi/navipi.cxx | 29
sc/source/ui/optdlg/tpusrlst.cxx | 4
sc/source/ui/pagedlg/areasdlg.cxx | 30
sc/source/ui/src/condformatdlg.src | 1
sc/source/ui/src/condformatmgr.src | 1
sc/source/ui/undo/areasave.cxx | 2
sc/source/ui/undo/undoblk3.cxx | 10
sc/source/ui/unoobj/addruno.cxx | 14
sc/source/ui/unoobj/cellsuno.cxx | 4
sc/source/ui/unoobj/chart2uno.cxx | 3
sc/source/ui/unoobj/viewuno.cxx | 8
sc/source/ui/vba/vbarange.cxx | 4
sc/source/ui/vba/vbawsfunction.cxx | 4
sc/source/ui/view/cellsh.cxx | 3
sc/source/ui/view/cellsh1.cxx | 47
sc/source/ui/view/cellsh2.cxx | 5
sc/source/ui/view/colrowba.cxx | 2
sc/source/ui/view/drawvie3.cxx | 4
sc/source/ui/view/formatsh.cxx | 63
sc/source/ui/view/gridwin.cxx | 28
sc/source/ui/view/gridwin2.cxx | 17
sc/source/ui/view/gridwin4.cxx | 5
sc/source/ui/view/output.cxx | 3
sc/source/ui/view/output2.cxx | 29
sc/source/ui/view/printfun.cxx | 3
sc/source/ui/view/tabview.cxx | 8
sc/source/ui/view/tabview4.cxx | 6
sc/source/ui/view/tabvwsha.cxx | 3
sc/source/ui/view/viewfun2.cxx | 4
sc/source/ui/view/viewfun5.cxx | 2
sc/source/ui/view/viewfun6.cxx | 8
sc/source/ui/view/viewfunc.cxx | 5
sc/source/ui/xmlsource/xmlsourcedlg.cxx | 6
sc/uiconfig/scalc/ui/textimportcsv.ui | 16
scp2/InstallModule_firebird.mk | 4
scp2/InstallScript_setup_osl.mk | 4
scp2/source/firebird/file_firebird.scp | 47
scp2/source/firebird/module_firebird.scp | 9
scp2/source/ooo/file_library_ooo.scp | 52
scp2/source/ooo/module_hidden_ooo.scp | 5
scp2/source/ooo/ure.scp | 72
scp2/source/python/profileitem_python.scp | 26
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 24
sd/README | 2
sd/inc/pglink.hxx | 2
sd/inc/sdpage.hxx | 4
sd/source/core/pglink.cxx | 10
sd/source/core/sdpage2.cxx | 4
sd/source/ui/dlg/copydlg.cxx | 16
sd/source/ui/inc/sdpreslt.hxx | 2
sd/source/ui/unoidl/sddetect.cxx | 8
sd/source/ui/view/drviewsc.cxx | 2
sfx2/inc/inettbc.hxx | 2
sfx2/inc/srchdlg.hxx | 10
sfx2/sdi/sfx.sdi | 47
sfx2/source/appl/app.cxx | 12
sfx2/source/appl/appcfg.cxx | 4
sfx2/source/appl/appdde.cxx | 6
sfx2/source/appl/appopen.cxx | 41
sfx2/source/appl/appserv.cxx | 1
sfx2/source/appl/childwin.cxx | 67
sfx2/source/appl/fileobj.cxx | 18
sfx2/source/appl/fileobj.hxx | 8
sfx2/source/appl/helpinterceptor.cxx | 2
sfx2/source/appl/helpinterceptor.hxx | 16
sfx2/source/appl/impldde.cxx | 14
sfx2/source/appl/impldde.hxx | 4
sfx2/source/appl/linkmgr2.cxx | 84
sfx2/source/appl/linksrc.cxx | 6
sfx2/source/appl/lnkbase2.cxx | 38
sfx2/source/appl/newhelp.cxx | 66
sfx2/source/appl/newhelp.hxx | 82
sfx2/source/appl/opengrf.cxx | 14
sfx2/source/appl/workwin.cxx | 4
sfx2/source/bastyp/fltfnc.cxx | 75
sfx2/source/bastyp/frmhtml.cxx | 19
sfx2/source/bastyp/frmhtmlw.cxx | 69
sfx2/source/bastyp/helper.cxx | 26
sfx2/source/bastyp/mieclip.cxx | 2
sfx2/source/bastyp/progress.cxx | 30
sfx2/source/bastyp/sfxhtml.cxx | 66
sfx2/source/config/evntconf.cxx | 4
sfx2/source/control/bindings.cxx | 2
sfx2/source/control/dispatch.cxx | 8
sfx2/source/control/minfitem.cxx | 16
sfx2/source/control/msgpool.cxx | 4
sfx2/source/control/objface.cxx | 32
sfx2/source/control/request.cxx | 8
sfx2/source/control/shell.cxx | 6
sfx2/source/control/templateabstractview.cxx | 12
sfx2/source/control/templatelocalview.cxx | 18
sfx2/source/control/thumbnailviewacc.cxx | 32
sfx2/source/dialog/alienwarn.cxx | 2
sfx2/source/dialog/backingwindow.cxx | 156
sfx2/source/dialog/backingwindow.hxx | 22
sfx2/source/dialog/basedlgs.cxx | 12
sfx2/source/dialog/dinfdlg.cxx | 106
sfx2/source/dialog/dockwin.cxx | 64
sfx2/source/dialog/filedlghelper.cxx | 176
sfx2/source/dialog/filedlgimpl.hxx | 16
sfx2/source/dialog/filtergrouping.cxx | 30
sfx2/source/dialog/mailmodel.cxx | 60
sfx2/source/dialog/mgetempl.cxx | 16
sfx2/source/dialog/newstyle.cxx | 2
sfx2/source/dialog/passwd.cxx | 2
sfx2/source/dialog/securitypage.cxx | 22
sfx2/source/dialog/splitwin.cxx | 18
sfx2/source/dialog/srchdlg.cxx | 30
sfx2/source/dialog/tabdlg.cxx | 56
sfx2/source/dialog/taskpane.cxx | 4
sfx2/source/dialog/templdlg.cxx | 133
sfx2/source/dialog/versdlg.cxx | 28
sfx2/source/doc/docfac.cxx | 46
sfx2/source/doc/docfile.cxx | 59
sfx2/source/doc/docfilt.cxx | 14
sfx2/source/doc/docinf.cxx | 14
sfx2/source/doc/docinsert.cxx | 8
sfx2/source/doc/doctempl.cxx | 48
sfx2/source/doc/doctemplates.cxx | 10
sfx2/source/doc/frmdescr.cxx | 4
sfx2/source/doc/guisaveas.cxx | 2
sfx2/source/doc/iframe.cxx | 2
sfx2/source/doc/new.cxx | 54
sfx2/source/doc/objcont.cxx | 22
sfx2/source/doc/objembed.cxx | 2
sfx2/source/doc/objmisc.cxx | 115
sfx2/source/doc/objserv.cxx | 22
sfx2/source/doc/objstor.cxx | 26
sfx2/source/doc/objxtor.cxx | 74
sfx2/source/doc/oleprops.cxx | 66
sfx2/source/doc/oleprops.hxx | 34
sfx2/source/doc/printhelper.cxx | 16
sfx2/source/doc/querytemplate.cxx | 2
sfx2/source/doc/querytemplate.hxx | 2
sfx2/source/doc/sfxbasemodel.cxx | 18
sfx2/source/doc/templatedlg.cxx | 2
sfx2/source/explorer/nochaos.cxx | 2
sfx2/source/inc/alienwarn.hxx | 2
sfx2/source/inc/appdata.hxx | 2
sfx2/source/inc/fltfnc.hxx | 28
sfx2/source/inc/nfltdlg.hxx | 57
sfx2/source/inc/objshimp.hxx | 8
sfx2/source/inc/sfxtypes.hxx | 2
sfx2/source/inc/templdgi.hxx | 10
sfx2/source/inc/virtmenu.hxx | 2
sfx2/source/inc/workwin.hxx | 8
sfx2/source/inet/inettbc.cxx | 20
sfx2/source/menu/mnuitem.cxx | 36
sfx2/source/menu/mnumgr.cxx | 22
sfx2/source/menu/thessubmenu.cxx | 16
sfx2/source/menu/thessubmenu.hxx | 6
sfx2/source/menu/virtmenu.cxx | 8
sfx2/source/notify/eventsupplier.cxx | 14
sfx2/source/sidebar/Deck.cxx | 4
sfx2/source/sidebar/DeckLayouter.cxx | 1
sfx2/source/sidebar/SidebarController.cxx | 19
sfx2/source/sidebar/SidebarController.hxx | 1
sfx2/source/statbar/stbitem.cxx | 2
sfx2/source/toolbox/tbxitem.cxx | 1
sfx2/source/view/frame.cxx | 16
sfx2/source/view/frmload.cxx | 4
sfx2/source/view/impviewframe.hxx | 4
sfx2/source/view/printer.cxx | 4
sfx2/source/view/viewfrm.cxx | 50
sfx2/source/view/viewfrm2.cxx | 16
sfx2/source/view/viewprn.cxx | 10
sfx2/source/view/viewsh.cxx | 12
sfx2/uiconfig/ui/startcenter.ui | 382
shell/source/tools/lngconvex/lngconvex.cxx | 45
solenv/bin/concat-deps.c | 2
solenv/bin/macosx-change-install-names.pl | 4
solenv/bin/macosx-codesign-app-bundle | 77
solenv/bin/modules/installer/simplepackage.pm | 25
solenv/bin/modules/installer/windows/feature.pm | 1
solenv/bin/modules/installer/windows/property.pm | 1
solenv/bin/modules/installer/windows/shortcut.pm | 1
solenv/bin/modules/pre2par/language.pm | 1
solenv/gbuild/GeneratedPackage.mk | 2
solenv/gbuild/Helper.mk | 2
solenv/gbuild/Library.mk | 2
solenv/gbuild/PythonTest.mk | 1
solenv/gbuild/platform/IOS_ARM_GCC.mk | 5
solenv/gbuild/platform/android.mk | 5
solenv/gbuild/platform/com_MSC_class.mk | 6
solenv/gbuild/platform/com_MSC_defs.mk | 9
solenv/gbuild/platform/macosx.mk | 10
solenv/gbuild/platform/mingw.mk | 9
solenv/gbuild/platform/solaris.mk | 5
solenv/gbuild/platform/unxgcc.mk | 5
soltools/mkdepend/main.c | 6
svl/source/fsstor/fsfactory.cxx | 4
svtools/source/control/ruler.cxx | 197
svtools/source/control/toolbarmenuacc.cxx | 32
svtools/source/control/valueacc.cxx | 32
svtools/source/uno/unoimap.cxx | 9
svx/source/accessibility/AccessibleFrameSelector.cxx | 10
svx/source/customshapes/EnhancedCustomShape3d.cxx | 2
svx/source/dialog/imapdlg.cxx | 8
svx/source/dialog/imapwnd.cxx | 8
svx/source/dialog/svxruler.cxx | 2107 ++--
svx/source/items/hlnkitem.cxx | 9
svx/source/sidebar/line/LineWidthControl.cxx | 2
svx/source/sidebar/nbdtmg.cxx | 26
svx/source/sidebar/nbdtmgfact.cxx | 13
svx/source/svdraw/svdfmtf.cxx | 2
svx/source/svdraw/svdfmtf.hxx | 2
svx/source/svdraw/svdmrkv.cxx | 46
svx/source/svdraw/svdobj.cxx | 26
svx/source/svdraw/svdograf.cxx | 4
svx/source/svdraw/svdoole2.cxx | 8
svx/source/svdraw/svdotxln.cxx | 26
svx/source/tbxctrls/fillctrl.cxx | 64
svx/source/tbxctrls/linectrl.cxx | 54
svx/source/unodraw/unoshape.cxx | 12
sw/UIConfig_swriter.mk | 1
sw/inc/crstate.hxx | 2
sw/inc/docsh.hxx | 2
sw/inc/globals.hrc | 2
sw/inc/helpid.h | 2
sw/inc/index.hrc | 2
sw/inc/ndgrf.hxx | 4
sw/inc/swbaslnk.hxx | 2
sw/inc/swserv.hxx | 2
sw/qa/extras/README | 6
sw/qa/extras/inc/swmodeltestbase.hxx | 9
sw/qa/extras/odfexport/odfexport.cxx | 4
sw/qa/extras/odfimport/odfimport.cxx | 4
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 29
sw/qa/extras/ooxmlimport/data/table-auto-nested.docx |binary
sw/qa/extras/ooxmlimport/data/table-style-parprop.docx |binary
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 136
sw/qa/extras/rtfexport/rtfexport.cxx | 14
sw/qa/extras/rtfimport/rtfimport.cxx | 89
sw/qa/extras/ww8export/ww8export.cxx | 11
sw/qa/extras/ww8import/ww8import.cxx | 9
sw/source/core/doc/doc.cxx | 2
sw/source/core/doc/swserv.cxx | 2
sw/source/core/docnode/ndcopy.cxx | 7
sw/source/core/docnode/section.cxx | 4
sw/source/core/docnode/swbaslnk.cxx | 2
sw/source/core/fields/ddefld.cxx | 4
sw/source/core/fields/docufld.cxx | 4
sw/source/core/graphic/ndgrf.cxx | 37
sw/source/core/layout/paintfrm.cxx | 15
sw/source/core/layout/trvlfrm.cxx | 45
sw/source/core/ole/ndole.cxx | 4
sw/source/core/undo/untbl.cxx | 1
sw/source/filter/html/htmlcss1.cxx | 7
sw/source/filter/html/htmlftn.cxx | 6
sw/source/filter/html/svxcss1.hxx | 1
sw/source/filter/html/swhtml.hxx | 2
sw/source/filter/ww8/hash_wrap.hxx | 6
sw/source/filter/ww8/sortedarray.hxx | 6
sw/source/filter/ww8/ww8scan.cxx | 2
sw/source/ui/app/docsh.cxx | 4
sw/source/ui/chrdlg/chardlg.cxx | 9
sw/source/ui/dialog/ascfldlg.cxx | 26
sw/source/ui/dochdl/swdtflvr.cxx | 8
sw/source/ui/docvw/AnchorOverlayObject.cxx | 26
sw/source/ui/docvw/edtwin.cxx | 4
sw/source/ui/fldui/fldpage.cxx | 16
sw/source/ui/fldui/fldpage.hxx | 4
sw/source/ui/frmdlg/frmpage.cxx | 6
sw/source/ui/inc/condedit.hxx | 1
sw/source/ui/inc/numfmtlb.hxx | 4
sw/source/ui/inc/redlndlg.hxx | 2
sw/source/ui/inc/swuicnttab.hxx | 100
sw/source/ui/index/cnttab.cxx | 592 -
sw/source/ui/index/cnttab.hrc | 131
sw/source/ui/index/cnttab.src | 446 -
sw/source/ui/misc/redlndlg.cxx | 10
sw/source/ui/shells/basesh.cxx | 2
sw/source/ui/shells/frmsh.cxx | 10
sw/source/ui/sidebar/PageMarginControl.cxx | 2
sw/source/ui/utlui/condedit.cxx | 8
sw/source/ui/utlui/numfmtlb.cxx | 23
sw/uiconfig/swriter/ui/paradialog.ui | 24
sw/uiconfig/swriter/ui/tocindexpage.ui | 1192 ++
test/Package_unittest.mk | 1
testtools/CustomTarget_bridgetest.mk | 11
testtools/CustomTarget_uno_test.mk | 1
toolkit/source/awt/vclxtoolkit.cxx | 23
toolkit/source/controls/tree/treedatamodel.cxx | 18
toolkit/source/helper/unowrapper.cxx | 1
tools/source/datetime/tdate.cxx | 2
tools/source/rc/resmgr.cxx | 1
tools/source/string/tustring.cxx | 40
tools/source/zcodec/zcodec.cxx | 2
translations | 2
ucb/source/core/ucbprops.cxx | 2
udkapi/com/sun/star/beans/PropertyState.idl | 8
unotools/source/config/pathoptions.cxx | 4
unotools/source/misc/fontcvt.cxx | 10
unotools/source/ucbhelper/ucbhelper.cxx | 20
unusedcode.easy | 6
ure/source/README | 101
vcl/Library_vcl.mk | 2
vcl/coretext/salgdi2.cxx | 60
vcl/generic/app/gendisp.cxx | 12
vcl/generic/glyphs/glyphcache.cxx | 8
vcl/source/app/dbggui.cxx | 9
vcl/source/control/button.cxx | 14
vcl/source/control/tabctrl.cxx | 107
vcl/source/edit/texteng.cxx | 6
vcl/source/filter/ixpm/rgbtable.hxx | 2
vcl/source/filter/wmf/winmtf.cxx | 16
vcl/source/fontsubset/sft.cxx | 2
vcl/source/gdi/bitmapex.cxx | 176
vcl/source/gdi/bmpacc.cxx | 120
vcl/source/gdi/dibtools.cxx | 39
vcl/source/gdi/impvect.cxx | 18
vcl/source/gdi/outdev2.cxx | 149
vcl/source/gdi/outdev3.cxx | 21
vcl/source/gdi/outmap.cxx | 4
vcl/source/gdi/sallayout.cxx | 2
vcl/source/window/dialog.cxx | 2
vcl/source/window/window.cxx | 1
vcl/unx/generic/plugadapt/salplug.cxx | 105
vcl/unx/gtk/gdi/salprn-gtk.cxx | 12
vcl/unx/gtk/window/gtksalframe.cxx | 2
vcl/unx/kde/fpicker/kdefpmain.cxx | 2
vcl/win/source/gdi/salbmp.cxx | 37
writerfilter/source/dmapper/DomainMapper.cxx | 13
writerfilter/source/dmapper/DomainMapperTableHandler.cxx | 38
writerfilter/source/dmapper/DomainMapperTableManager.cxx | 9
writerperfect/source/writer/WordPerfectImportFilter.cxx | 2
1255 files changed, 17152 insertions(+), 19349 deletions(-)
New commits:
commit 204b9f11527701e466ee7a52c0bd2d507b178c0d
Author: Andres Gomez <agomez at igalia.com>
Date: Fri Aug 30 16:47:06 2013 +0300
qa: Adding UT for new InteropGrabBag property in Shape service
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
index 8603486..66f2a89 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScAnnotationShapeObj.csv
@@ -76,6 +76,7 @@
"ScAnnotationShapeObj";"com::sun::star::drawing::Shape";"Style#optional"
"ScAnnotationShapeObj";"com::sun::star::drawing::Shape";"Transformation#optional"
"ScAnnotationShapeObj";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"ScAnnotationShapeObj";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"ScAnnotationShapeObj";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex"
"ScAnnotationShapeObj";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex"
"ScAnnotationShapeObj";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontNameComplex"
diff --git a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
index e4cb081..607ebb7 100644
--- a/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
+++ b/qadevOOo/objdsc/sc/com.sun.star.comp.office.ScShapeObj.csv
@@ -11,6 +11,7 @@
"ScShapeObj";"com::sun::star::drawing::Shape";"Style#optional"
"ScShapeObj";"com::sun::star::drawing::Shape";"Transformation#optional"
"ScShapeObj";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"ScShapeObj";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"ScShapeObj";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()"
"ScShapeObj";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()"
"ScShapeObj";"com::sun::star::sheet::Shape";"Anchor"
diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv
index 8622aca..1762649 100644
--- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv
+++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartLegend.csv
@@ -12,6 +12,7 @@
"ChartLegend";"com::sun::star::drawing::Shape";"Style#optional"
"ChartLegend";"com::sun::star::drawing::Shape";"Transformation#optional"
"ChartLegend";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"ChartLegend";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"ChartLegend";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()"
"ChartLegend";"com::sun::star::drawing::LineProperties";"LineStyle"
"ChartLegend";"com::sun::star::drawing::LineProperties";"LineDash"
diff --git a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv
index 0bdbcc3..40b5311 100644
--- a/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv
+++ b/qadevOOo/objdsc/sch/com.sun.star.comp.office.ChartTitle.csv
@@ -12,6 +12,7 @@
"ChartTitle";"com::sun::star::drawing::Shape";"Style#optional"
"ChartTitle";"com::sun::star::drawing::Shape";"Transformation#optional"
"ChartTitle";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"ChartTitle";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"ChartTitle";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()"
"ChartTitle";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()"
"ChartTitle";"com::sun::star::chart::ChartTitle";"TextRotation"
diff --git a/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXShape.csv b/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXShape.csv
index 06fa7a0..de7cc83 100644
--- a/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXShape.csv
+++ b/qadevOOo/objdsc/sd/com.sun.star.comp.office.SdXShape.csv
@@ -11,6 +11,7 @@
"SdXShape";"com::sun::star::drawing::Shape";"Style#optional"
"SdXShape";"com::sun::star::drawing::Shape";"Transformation#optional"
"SdXShape";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"SdXShape";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"SdXShape";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()"
"SdXShape";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()"
"SdXShape";"com::sun::star::beans::XTolerantMultiPropertySet#optional";"setPropertyValuesTolerant()"
diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxGraphicObject.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxGraphicObject.csv
index b7605ee..9236825 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxGraphicObject.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxGraphicObject.csv
@@ -76,6 +76,7 @@
"SvxGraphicObject";"com::sun::star::drawing::Shape";"Style#optional"
"SvxGraphicObject";"com::sun::star::drawing::Shape";"Transformation#optional"
"SvxGraphicObject";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"SvxGraphicObject";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"SvxGraphicObject";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex"
"SvxGraphicObject";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex"
"SvxGraphicObject";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontNameComplex"
diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShape.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShape.csv
index 7010893..96fa72a 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShape.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShape.csv
@@ -76,6 +76,7 @@
"SvxShape";"com::sun::star::drawing::Shape";"Style#optional"
"SvxShape";"com::sun::star::drawing::Shape";"Transformation#optional"
"SvxShape";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"SvxShape";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"SvxShape";"com::sun::star::drawing::TextShape";"CornerRadius"
"SvxShape";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex"
"SvxShape";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex"
diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeCircle.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeCircle.csv
index 8e1814d..8624bbb 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeCircle.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeCircle.csv
@@ -76,6 +76,7 @@
"SvxShapeCircle";"com::sun::star::drawing::Shape";"Style#optional"
"SvxShapeCircle";"com::sun::star::drawing::Shape";"Transformation#optional"
"SvxShapeCircle";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"SvxShapeCircle";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"SvxShapeCircle";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex"
"SvxShapeCircle";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex"
"SvxShapeCircle";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontNameComplex"
diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeConnector.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeConnector.csv
index 95b9abe..4502a89 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeConnector.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeConnector.csv
@@ -76,6 +76,7 @@
"SvxShapeConnector";"com::sun::star::drawing::Shape";"Style#optional"
"SvxShapeConnector";"com::sun::star::drawing::Shape";"Transformation#optional"
"SvxShapeConnector";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"SvxShapeConnector";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"SvxShapeConnector";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex"
"SvxShapeConnector";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex"
"SvxShapeConnector";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontNameComplex"
diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeControl.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeControl.csv
index 945c4fc..cc05a7c 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeControl.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeControl.csv
@@ -11,6 +11,7 @@
"SvxShapeControl";"com::sun::star::drawing::Shape";"Style#optional"
"SvxShapeControl";"com::sun::star::drawing::Shape";"Transformation#optional"
"SvxShapeControl";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"SvxShapeControl";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"SvxShapeControl";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()"
"SvxShapeControl";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()"
"SvxShapeControl";"com::sun::star::drawing::XControlShape";"getControl()"
diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeDimensioning.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeDimensioning.csv
index 1713d9c..7ae14a3 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeDimensioning.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeDimensioning.csv
@@ -94,6 +94,7 @@
"SvxShapeDimensioning";"com::sun::star::drawing::Shape";"Style#optional"
"SvxShapeDimensioning";"com::sun::star::drawing::Shape";"Transformation#optional"
"SvxShapeDimensioning";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"SvxShapeDimensioning";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"SvxShapeDimensioning";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex"
"SvxShapeDimensioning";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex"
"SvxShapeDimensioning";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontNameComplex"
diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeGroup.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeGroup.csv
index c20164a..31cf3df 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeGroup.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapeGroup.csv
@@ -13,6 +13,7 @@
"SvxShapeGroup";"com::sun::star::drawing::Shape";"Style#optional"
"SvxShapeGroup";"com::sun::star::drawing::Shape";"Transformation#optional"
"SvxShapeGroup";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"SvxShapeGroup";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"SvxShapeGroup";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()"
"SvxShapeGroup";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()"
"SvxShapeGroup";"com::sun::star::drawing::XShapeGroup";"enterGroup()"
diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygon.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygon.csv
index 9fdea2b..c266cb7 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygon.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygon.csv
@@ -76,6 +76,7 @@
"SvxShapePolyPolygon";"com::sun::star::drawing::Shape";"Style#optional"
"SvxShapePolyPolygon";"com::sun::star::drawing::Shape";"Transformation#optional"
"SvxShapePolyPolygon";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"SvxShapePolyPolygon";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"SvxShapePolyPolygon";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex"
"SvxShapePolyPolygon";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex"
"SvxShapePolyPolygon";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontNameComplex"
diff --git a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygonBezier.csv b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygonBezier.csv
index ad9eb30..f57e463 100644
--- a/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygonBezier.csv
+++ b/qadevOOo/objdsc/svx/com.sun.star.comp.office.SvxShapePolyPolygonBezier.csv
@@ -79,6 +79,7 @@
"SvxShapePolyPolygonBezier";"com::sun::star::drawing::Shape";"Style#optional"
"SvxShapePolyPolygonBezier";"com::sun::star::drawing::Shape";"Transformation#optional"
"SvxShapePolyPolygonBezier";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"SvxShapePolyPolygonBezier";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharHeightComplex"
"SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharWeightComplex"
"SvxShapePolyPolygonBezier";"com::sun::star::style::CharacterPropertiesComplex#optional";"CharFontNameComplex"
diff --git a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXShape.csv b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXShape.csv
index ca857ce..17acfb9 100644
--- a/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXShape.csv
+++ b/qadevOOo/objdsc/sw/com.sun.star.comp.office.SwXShape.csv
@@ -11,6 +11,7 @@
"SwXShape";"com::sun::star::drawing::Shape";"Style#optional"
"SwXShape";"com::sun::star::drawing::Shape";"Transformation#optional"
"SwXShape";"com::sun::star::drawing::Shape";"ShapeUserDefinedAttributes#optional"
+"SwXShape";"com::sun::star::drawing::Shape";"InteropGrabBag#optional"
"SwXShape";"com::sun::star::drawing::XShapeDescriptor";"getShapeType()"
"SwXShape";"com::sun::star::drawing::XGluePointsSupplier#optional";"getGluePoints()"
"SwXShape";"com::sun::star::beans::XPropertySet";"getPropertySetInfo()"
commit bca8e93e3e300d9d1538f9257828bea44a381c0f
Author: Andres Gomez <agomez at igalia.com>
Date: Mon Aug 26 18:33:38 2013 +0300
svx: new InteropGrabBag UNO property in Shape service
diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx
index caf3758..cc9eb45 100644
--- a/drawinglayer/source/dumper/XShapeDumper.cxx
+++ b/drawinglayer/source/dumper/XShapeDumper.cxx
@@ -37,6 +37,7 @@ namespace {
void dumpGradientProperty(com::sun::star::awt::Gradient aGradient, xmlTextWriterPtr xmlWriter);
void dumpPolyPolygonBezierCoords(com::sun::star::drawing::PolyPolygonBezierCoords aPolyPolygonBezierCoords, xmlTextWriterPtr xmlWriter);
void dumpPointSequenceSequence(com::sun::star::drawing::PointSequenceSequence aPointSequenceSequence, uno::Sequence<uno::Sequence<drawing::PolygonFlags> >*, xmlTextWriterPtr xmlWriter);
+void dumpPropertyValueAsElement(const beans::PropertyValue& rPropertyValue, xmlTextWriterPtr xmlWriter);
// FillProperties.idl
void dumpFillStyleAsAttribute(com::sun::star::drawing::FillStyle eFillStyle, xmlTextWriterPtr xmlWriter);
@@ -133,6 +134,7 @@ void dumpHomogenMatrixLine3(com::sun::star::drawing::HomogenMatrixLine3 aLine, x
void dumpTransformationAsElement(com::sun::star::drawing::HomogenMatrix3 aTransformation, xmlTextWriterPtr xmlWriter);
void dumpNavigationOrderAsAttribute(sal_Int32 aNavigationOrder, xmlTextWriterPtr xmlWriter);
void dumpHyperlinkAsAttribute(OUString sHyperlink, xmlTextWriterPtr xmlWriter);
+void dumpInteropGrabBagAsElement(uno::Sequence< beans::PropertyValue> aInteropGrabBag, xmlTextWriterPtr xmlWriter);
// CustomShape.idl
void dumpCustomShapeEngineAsAttribute(OUString sCustomShapeEngine, xmlTextWriterPtr xmlWriter);
@@ -1052,6 +1054,17 @@ void dumpHyperlinkAsAttribute(OUString sHyperlink, xmlTextWriterPtr xmlWriter)
OUStringToOString(sHyperlink, RTL_TEXTENCODING_UTF8).getStr());
}
+void dumpInteropGrabBagAsElement(uno::Sequence< beans::PropertyValue> aInteropGrabBag, xmlTextWriterPtr xmlWriter)
+{
+ xmlTextWriterStartElement(xmlWriter, BAD_CAST( "InteropGrabBag" ));
+
+ sal_Int32 nLength = aInteropGrabBag.getLength();
+ for (sal_Int32 i = 0; i < nLength; ++i)
+ dumpPropertyValueAsElement(aInteropGrabBag[i], xmlWriter);
+
+ xmlTextWriterEndElement( xmlWriter );
+}
+
// --------------------------------
// ---------- XShape.idl ----------
// --------------------------------
@@ -1154,6 +1167,10 @@ void dumpPropertyValueAsElement(const beans::PropertyValue& rPropertyValue, xmlT
xmlTextWriterEndElement(xmlWriter);
}
+
+ // TODO: Add here dumping of XDocument for future OOX Smart-Art
+ // properties.
+
// TODO more, if necessary
xmlTextWriterWriteFormatAttribute(xmlWriter, BAD_CAST("handle"), "%" SAL_PRIdINT32, rPropertyValue.Handle);
diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 38ba3bd..3fa0ebd 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -154,6 +154,7 @@
#define UNO_NAME_POLYPOLYGONBEZIER "PolyPolygonBezier"
#define UNO_NAME_POLYGON "Polygon"
+#define UNO_NAME_MISC_OBJ_INTEROPGRABBAG "InteropGrabBag"
#define UNO_NAME_MISC_OBJ_ZORDER "ZOrder"
#define UNO_NAME_MISC_OBJ_MOVEPROTECT "MoveProtect"
#define UNO_NAME_MISC_OBJ_SIZEPROTECT "SizeProtect"
diff --git a/include/svl/solar.hrc b/include/svl/solar.hrc
index a761c7d..c399a1a 100644
--- a/include/svl/solar.hrc
+++ b/include/svl/solar.hrc
@@ -23,7 +23,7 @@
// defines ------------------------------------------------------------------
#define OWN_ATTR_VALUE_START 3900
-#define OWN_ATTR_VALUE_END 3990
+#define OWN_ATTR_VALUE_END 3991
#define RID_SFX_START 260
// RID_SFX_END 9999
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index f9d4cec..fb763dd 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -26,7 +26,9 @@
#include <vcl/mapmod.hxx>
#include <tools/string.hxx>
#include <tools/weakbase.hxx>
+#include <com/sun/star/uno/Any.hxx>
#include <svl/lstner.hxx>
+#include <svl/grabbagitem.hxx>
#include <vcl/timer.hxx>
#include <svx/svdsob.hxx>
#include <svx/svdtypes.hxx> // fuer SdrLayerID
@@ -385,6 +387,9 @@ protected:
sal_uInt32 nOrdNum; // Rangnummer des Obj in der Liste
+ SfxGrabBagItem aGrabBagItem; // Holds the GrabBagItem property
+
+
/** Position in the navigation order. SAL_MAX_UINT32 when not used.
*/
sal_uInt32 mnNavigationPosition;
@@ -566,6 +571,11 @@ public:
// geschehen.
void SetOrdNum(sal_uInt32 nNum);
+ // GrabBagItem for interim interop purposes
+ void GetGrabBagItem(com::sun::star::uno::Any& rVal) const;
+
+ void SetGrabBagItem(const com::sun::star::uno::Any& rVal);
+
/** Return the position in the navigation order for the called object.
Note that this method may update the navigation position of the
called and of other SdrObjects. Therefore this method can not be
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 995eed8..3c35b39 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -186,7 +186,8 @@
#define OWN_ATTR_MEDIA_STREAM (OWN_ATTR_VALUE_START+89)
#define OWN_ATTR_MEDIA_TEMPFILEURL (OWN_ATTR_VALUE_START+90)
-// ATTENTION: maximum is OWN_ATTR_VALUE_START+90, see svl/inc/svl/solar.hrc
+#define OWN_ATTR_INTEROPGRABBAG (OWN_ATTR_VALUE_START+91)
+// ATTENTION: maximum is OWN_ATTR_VALUE_START+91, see include/svl/solar.hrc
// #FontWork#
#define FONTWORK_PROPERTIES \
@@ -315,6 +316,7 @@
{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_BOUNDRECT), OWN_ATTR_BOUNDRECT, &::getCppuType((const ::com::sun::star::awt::Rectangle*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
#define MISC_OBJ_PROPERTIES \
+ { MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_INTEROPGRABBAG), OWN_ATTR_INTEROPGRABBAG, SEQTYPE(::getCppuType((::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >*)0)), 0, 0}, \
MISC_OBJ_PROPERTIES_NO_SHEAR \
{ MAP_CHAR_LEN(UNO_NAME_MISC_OBJ_SHEARANGLE), SDRATTR_SHEARANGLE, &::getCppuType((const sal_Int32*)0), 0, 0},
diff --git a/offapi/com/sun/star/drawing/Shape.idl b/offapi/com/sun/star/drawing/Shape.idl
index bc1ac37..64f8ab4 100644
--- a/offapi/com/sun/star/drawing/Shape.idl
+++ b/offapi/com/sun/star/drawing/Shape.idl
@@ -27,7 +27,7 @@
#include <com/sun/star/drawing/XGluePointsSupplier.idl>
#include <com/sun/star/container/XNameContainer.idl>
#include <com/sun/star/beans/XTolerantMultiPropertySet.idl>
-
+#include <com/sun/star/beans/PropertyValue.idl>
module com { module sun { module star { module drawing {
@@ -153,6 +153,17 @@ published service Shape
/** this property lets you get and set a hyperlink for this shape.
*/
[optional, property] string Hyperlink;
+
+ /** Grab bag of shape properties, used as a string-any map for
+ interim interop purposes.
+
+ @since LibreOffice 4.2
+
+ <p>This property is intentionally not handled by the ODF
+ filter. Any member that should be handled there should be
+ first moved out from this grab bag to a separate property.</p>
+ */
+ [optional, property] sequence<com::sun::star::beans::PropertyValue> InteropGrabBag;
};
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 9f9b453..8278a50 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -906,6 +906,19 @@ void SdrObject::SetOrdNum(sal_uInt32 nNum)
nOrdNum = nNum;
}
+void SdrObject::GetGrabBagItem(com::sun::star::uno::Any& rVal) const
+{
+ aGrabBagItem.QueryValue(rVal);
+}
+
+void SdrObject::SetGrabBagItem(const com::sun::star::uno::Any& rVal)
+{
+ aGrabBagItem.PutValue(rVal);
+ // Notifying that the object has changed: needed?
+ SetChanged();
+ BroadcastObjectChange();
+}
+
sal_uInt32 SdrObject::GetNavigationPosition (void)
{
if (pObjList!=NULL && pObjList->RecalcNavigationPositions())
@@ -1086,6 +1099,9 @@ SdrObject& SdrObject::operator=(const SdrObject& rObj)
delete pPlusData->pBroadcast; // broadcaster isn't copied
pPlusData->pBroadcast=NULL;
}
+
+ aGrabBagItem.SetGrabBag(rObj.aGrabBagItem.GetGrabBag());
+
aGridOffset = rObj.aGridOffset;
return *this;
}
diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 1a9c365..f320907 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -2451,6 +2451,12 @@ bool SvxShape::setPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
break;
}
+ case OWN_ATTR_INTEROPGRABBAG:
+ {
+ mpObj->SetGrabBagItem(rValue);
+ return true;
+ }
+
case SDRATTR_OBJMOVEPROTECT:
{
sal_Bool bMoveProtect = sal_Bool();
@@ -2854,6 +2860,12 @@ bool SvxShape::getPropertyValueImpl( const OUString&, const SfxItemPropertySimpl
rValue <<= (sal_Int32)mpObj->GetShearAngle();
break;
+ case OWN_ATTR_INTEROPGRABBAG:
+ {
+ mpObj->GetGrabBagItem(rValue);
+ break;
+ }
+
case SDRATTR_OBJMOVEPROTECT:
rValue = uno::makeAny( (sal_Bool) mpObj->IsMoveProtect() );
break;
commit 990c5e4b4044e5a6230dc1000eabbf07184843f0
Author: Andres Gomez <agomez at igalia.com>
Date: Tue Aug 20 15:50:01 2013 +0300
oox: Enhancing the debugging output
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox
index 83b3ac0..23423c42 100644
--- a/include/sal/log-areas.dox
+++ b/include/sal/log-areas.dox
@@ -131,6 +131,7 @@ certain functionality.
@li @c filter.ms - escher import/export
@li @c filter.xslt - xslt import/export
@li @c oox.cscode - see oox/source/drawingml/customshapes/README
+ at li @c oox.drawingml - DrawingML
@li @c oox.ppt - pptx filter
@li @c oox.storage - ZipStorage class
@li @c oox.xmlstream - XmlStream class
diff --git a/oox/source/drawingml/graphicshapecontext.cxx b/oox/source/drawingml/graphicshapecontext.cxx
index 0def785..73882f8 100644
--- a/oox/source/drawingml/graphicshapecontext.cxx
+++ b/oox/source/drawingml/graphicshapecontext.cxx
@@ -232,13 +232,14 @@ ContextHandlerRef DiagramGraphicDataContext::onCreateContext( ::sal_Int32 aEleme
getFragmentPathFromRelId( msLo ),
getFragmentPathFromRelId( msQs ),
getFragmentPathFromRelId( msCs ));
- OSL_TRACE("diagram added shape %s of type %s, size (%d,%d,%d,%d)",
- OUSTRING_TO_CSTR( mpShapePtr->getName() ),
- OUSTRING_TO_CSTR( mpShapePtr->getServiceName() ),
- mpShapePtr->getPosition().X,
- mpShapePtr->getPosition().Y,
- mpShapePtr->getSize().Width,
- mpShapePtr->getSize().Height);
+ SAL_INFO("oox.drawingml", OSL_THIS_FUNC
+ << "diagram added shape " << mpShapePtr->getName()
+ << " of type " << mpShapePtr->getServiceName()
+ << ", size (" << mpShapePtr->getPosition().X
+ << "," << mpShapePtr->getPosition().Y
+ << "," << mpShapePtr->getSize().Width
+ << "," << mpShapePtr->getSize().Height
+ <<")");
break;
}
default:
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index f065d1b..ee9d9de 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -200,7 +200,7 @@ void Shape::addShape(
const awt::Rectangle* pShapeRect,
ShapeIdMap* pShapeMap )
{
- SAL_INFO("oox", OSL_THIS_FUNC << " id: " << msId);
+ SAL_INFO("oox.drawingml", OSL_THIS_FUNC << " id: " << msId);
try
{
@@ -238,7 +238,7 @@ bool Shape::getLockedCanvas()
void Shape::applyShapeReference( const Shape& rReferencedShape, bool bUseText )
{
- SAL_INFO("oox", "apply shape reference: " << rReferencedShape.msId << " to shape id: " << msId);
+ SAL_INFO("oox", OSL_THIS_FUNC << "apply shape reference: " << rReferencedShape.msId << " to shape id: " << msId);
if ( rReferencedShape.mpTextBody.get() && bUseText )
mpTextBody = TextBodyPtr( new TextBody( *rReferencedShape.mpTextBody.get() ) );
@@ -309,16 +309,16 @@ void Shape::addChildren(
aChildTransformation.scale(1/(maChSize.Width ? maChSize.Width : 1.0), 1/(maChSize.Height ? maChSize.Height : 1.0));
aChildTransformation *= aTransformation;
- OSL_TRACE("parent matrix:\n%f %f %f\n%f %f %f\n%f %f %f",
- aChildTransformation.get(0, 0),
- aChildTransformation.get(0, 1),
- aChildTransformation.get(0, 2),
- aChildTransformation.get(1, 0),
- aChildTransformation.get(1, 1),
- aChildTransformation.get(1, 2),
- aChildTransformation.get(2, 0),
- aChildTransformation.get(2, 1),
- aChildTransformation.get(2, 2));
+ SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "parent matrix:\n"
+ << aChildTransformation.get(0, 0)
+ << aChildTransformation.get(0, 1)
+ << aChildTransformation.get(0, 2) << "\n"
+ << aChildTransformation.get(1, 0)
+ << aChildTransformation.get(1, 1)
+ << aChildTransformation.get(1, 2)
+ << aChildTransformation.get(2, 0)
+ << aChildTransformation.get(2, 1)
+ << aChildTransformation.get(2, 2));
std::vector< ShapePtr >::iterator aIter( rMaster.maChildren.begin() );
while( aIter != rMaster.maChildren.end() ) {
@@ -339,7 +339,7 @@ Reference< XShape > Shape::createAndInsert(
FillProperties& rShapeOrParentShapeFillProps )
{
bool bIsEmbMedia = false;
- SAL_INFO("oox", OSL_THIS_FUNC << " id: " << msId);
+ SAL_INFO("oox.drawingml", OSL_THIS_FUNC << " id: " << msId);
awt::Rectangle aShapeRectHmm( maPosition.X / 360, maPosition.Y / 360, maSize.Width / 360, maSize.Height / 360 );
@@ -477,7 +477,7 @@ Reference< XShape > Shape::createAndInsert(
if ( mbHidden || mbHiddenMasterShape )
{
- SAL_INFO("oox", "invisible shape with id: " << msId);
+ SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "invisible shape with id: " << msId);
const OUString sVisible( "Visible" );
xSet->setPropertyValue( sVisible, Any( sal_False ) );
}
@@ -613,7 +613,7 @@ Reference< XShape > Shape::createAndInsert(
if( pTheme )
if( const TextCharacterProperties* pCharProps = pTheme->getFontStyle( pFontRef->mnThemedIdx ) )
aCharStyleProperties.assignUsed( *pCharProps );
- SAL_INFO("oox", "use font color");
+ SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "use font color");
aCharStyleProperties.maCharColor.assignIfUsed( pFontRef->maPhClr );
}
@@ -649,7 +649,7 @@ void Shape::moveAllToPosition( const awt::Point &rPoint )
void Shape::setMasterTextListStyle( const TextListStylePtr& pMasterTextListStyle )
{
- SAL_INFO("oox", "set master text list style to shape id: " << msId);
+ SAL_INFO("oox.drawingml", OSL_THIS_FUNC << "set master text list style to shape id: " << msId);
mpMasterTextListStyle = pMasterTextListStyle;
}
commit 5dce602d31bfc3ab57653b5922459fec46a1e1be
Author: Armin Le Grand <alg at apache.org>
Date: Fri Aug 30 11:35:57 2013 +0000
Resolves: #i123129# Corrected LineWidth for text comments in SW
(cherry picked from commit 7ed3f859004e0763598a7d6edc7e4dec2b69813c)
Change-Id: Ife132b66a13208193d897e98cdaea17bce33c310
diff --git a/sw/source/ui/docvw/AnchorOverlayObject.cxx b/sw/source/ui/docvw/AnchorOverlayObject.cxx
index 1cd43528..5ea13c2 100644
--- a/sw/source/ui/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/ui/docvw/AnchorOverlayObject.cxx
@@ -45,7 +45,7 @@ private:
basegfx::BColor maColor;
// discrete line width
- double mfLogicLineWidth;
+ double mfDiscreteLineWidth;
// bitfield
bool mbShadow : 1;
@@ -61,7 +61,7 @@ public:
const basegfx::B2DPolygon& rLineTop,
AnchorState aAnchorState,
const basegfx::BColor& rColor,
- double fLogicLineWidth,
+ double fDiscreteLineWidth,
bool bShadow,
bool bLineSolid )
: drawinglayer::primitive2d::DiscreteMetricDependentPrimitive2D(),
@@ -70,7 +70,7 @@ public:
maLineTop(rLineTop),
maAnchorState(aAnchorState),
maColor(rColor),
- mfLogicLineWidth(fLogicLineWidth),
+ mfDiscreteLineWidth(fDiscreteLineWidth),
mbShadow(bShadow),
mbLineSolid(bLineSolid)
{}
@@ -81,7 +81,7 @@ public:
const basegfx::B2DPolygon& getLineTop() const { return maLineTop; }
AnchorState getAnchorState() const { return maAnchorState; }
const basegfx::BColor& getColor() const { return maColor; }
- double getLogicLineWidth() const { return mfLogicLineWidth; }
+ double getDiscreteLineWidth() const { return mfDiscreteLineWidth; }
bool getShadow() const { return mbShadow; }
bool getLineSolid() const { return mbLineSolid; }
@@ -108,14 +108,15 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecompos
drawinglayer::primitive2d::appendPrimitive2DReferenceToPrimitive2DSequence(aRetval, aTriangle);
}
+ // prepare view-independent LineWidth and color
+ const drawinglayer::attribute::LineAttribute aLineAttribute(
+ getColor(),
+ getDiscreteLineWidth() * getDiscreteUnit());
+
if ( AS_ALL == maAnchorState ||
AS_START == maAnchorState )
{
// create line start
- const drawinglayer::attribute::LineAttribute aLineAttribute(
- getColor(),
- getLogicLineWidth() / (basegfx::fTools::equalZero(getDiscreteUnit()) ? 1.0 : getDiscreteUnit()));
-
if(getLineSolid())
{
const drawinglayer::primitive2d::Primitive2DReference aSolidLine(
@@ -194,10 +195,6 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorPrimitive::create2DDecompos
{
// LineTop has to be created, too, but uses no shadow, so add after
// the other parts are created
- const drawinglayer::attribute::LineAttribute aLineAttribute(
- getColor(),
- getLogicLineWidth() / (basegfx::fTools::equalZero(getDiscreteUnit()) ? 1.0 : getDiscreteUnit()));
-
const drawinglayer::primitive2d::Primitive2DReference aLineTop(
new drawinglayer::primitive2d::PolygonStrokePrimitive2D(
getLineTop(),
@@ -220,7 +217,7 @@ bool AnchorPrimitive::operator==( const drawinglayer::primitive2d::BasePrimitive
&& getLineTop() == rCompare.getLineTop()
&& getAnchorState() == rCompare.getAnchorState()
&& getColor() == rCompare.getColor()
- && getLogicLineWidth() == rCompare.getLogicLineWidth()
+ && getDiscreteLineWidth() == rCompare.getDiscreteLineWidth()
&& getShadow() == rCompare.getShadow()
&& getLineSolid() == rCompare.getLineSolid());
}
@@ -346,13 +343,14 @@ drawinglayer::primitive2d::Primitive2DSequence AnchorOverlayObject::createOverla
{
implEnsureGeometry();
+ static double aDiscreteLineWidth(1.6);
const drawinglayer::primitive2d::Primitive2DReference aReference(
new AnchorPrimitive( maTriangle,
maLine,
maLineTop,
GetAnchorState(),
getBaseColor().getBColor(),
- ANCHORLINE_WIDTH * 15.0,
+ ANCHORLINE_WIDTH * aDiscreteLineWidth,
getShadowedEffect(),
getLineSolid()) );
commit fe1cbda3b7513e0d3686d347aa991e7231067384
Author: Caolán McNamara <caolanm at redhat.com>
Date: Fri Aug 30 14:18:40 2013 +0100
Resolves: fdo#68396 Yield allowed layout timer to run during init layout
There are multiple pages getting generated in the styles dialog because the
dropcaps preview window calls "Yield" sometimes and sometimes the layout timer
gets a chance to activate *during* the creation of the dialog so there ends up
with two consecutive activations of some tabpages which has wonderful eventual
know on effects resulting in that crash later on.
Easiest thing is to disable the layout timer during the initial size
calculation
Change-Id: I7fb0a7ff89aa2c6013c5d8014deface107610000
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index eeb70a3..ef14a79 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -1256,7 +1256,7 @@ IMPL_LINK( Dialog, ImplHandleLayoutTimerHdl, void*, EMPTYARG )
void Dialog::queue_layout()
{
- if (hasPendingLayout())
+ if (hasPendingLayout() || isCalculatingInitialLayoutSize())
return;
if (IsInClose())
return;
commit 7113e2310b2a1eeb9d9e89bf5e7ed3a10f3640dd
Author: Eike Rathke <erack at redhat.com>
Date: Fri Aug 30 14:41:30 2013 +0200
eliminated yet another language-country parser
Change-Id: I2aebe058a6d60431b7073aca641910dc365ead09
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index d40f4b8..34cf3c8 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -162,43 +162,24 @@ public:
iso_lang_identifier() {};
iso_lang_identifier(const OString& str) :
- lang_(str)
- { init(); }
+ maBcp47(str)
+ { }
iso_lang_identifier(const std::string& str) :
- lang_(str.c_str())
- { init(); }
+ maBcp47(str.c_str())
+ { }
- OString language() const
- { return lang_; }
-
- OString country() const
- { return country_; }
+ OUString make_OUString() const
+ { return OStringToOUString( maBcp47, RTL_TEXTENCODING_ASCII_US); }
OString make_OString() const
- { return lang_ + "-" + country_; }
+ { return maBcp47; }
std::string make_std_string() const
- {
- OString tmp(lang_ + "-" + country_);
- return tmp.getStr();
- }
-
-private:
- void init()
- {
- sal_Int32 idx = lang_.indexOf('-');
-
- if (idx > -1)
- {
- country_ = lang_.copy(idx + 1);
- lang_ = lang_.copy(0, idx);
- }
- }
+ { return maBcp47.getStr(); }
private:
- OString lang_;
- OString country_;
+ OString maBcp47;
};
/** Convert a OUString to the MS resource
@@ -328,9 +309,7 @@ void add_group_entries(
OString iso_lang = aConfig.GetKeyName(sal::static_int_cast<sal_uInt16>(i));
OString key_value_utf8 = aConfig.ReadKey(sal::static_int_cast<sal_uInt16>(i));
iso_lang_identifier myiso_lang( iso_lang );
- LanguageType ltype = LanguageTag(
- OStringToOUString( myiso_lang.language(), RTL_TEXTENCODING_UTF8),
- OStringToOUString( myiso_lang.country(), RTL_TEXTENCODING_UTF8)).makeFallback().getLanguageType();
+ LanguageType ltype = LanguageTag( myiso_lang.make_OUString()).makeFallback().getLanguageType();
if( ( ltype & 0x0200 ) == 0 && map[ ltype ].empty() )
{
Substitutor.set_language(iso_lang_identifier(iso_lang));
@@ -457,9 +436,7 @@ void start_language_section(
std::string lang_section("LANGUAGE ");
- LanguageType ltype = LanguageTag(
- OStringToOUString( iso_lang.language(), RTL_TEXTENCODING_UTF8),
- OStringToOUString( iso_lang.country(), RTL_TEXTENCODING_UTF8)).makeFallback().getLanguageType();
+ LanguageType ltype = LanguageTag( iso_lang.make_OUString()).makeFallback().getLanguageType();
char buff[10];
int primLangID = PRIMARYLANGID(ltype);
commit 21ee132af1b888f50a9d916337011879570ca357
Author: Fridrich Štrba <fridrich.strba at bluewin.ch>
Date: Fri Aug 30 14:31:29 2013 +0200
Revert some random work-in-progress that is most probably bitrotten
Revert "EMF+: aBaseTransform is a hardcoded identity matrix, don't bother with it"
This reverts commit 2b700a710e44d2d09f45793f5f2448268e66d4fe.
Revert "Pass also the bounding box in device units to the EMF+ part"
This reverts commit f387c5da5a824df6cf2874155c13445a86804475.
diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx
index 63cce82f..79a2967 100644
--- a/cppcanvas/source/inc/implrenderer.hxx
+++ b/cppcanvas/source/inc/implrenderer.hxx
@@ -286,6 +286,7 @@ static float GetSwapFloat( SvStream& rSt )
ActionVector maActions;
/* EMF+ */
+ XForm aBaseTransform;
XForm aWorldTransform;
EMFPObject* aObjects [256];
float fPageScale;
@@ -294,10 +295,6 @@ static float GetSwapFloat( SvStream& rSt )
sal_Int32 nHDPI;
sal_Int32 nVDPI;
/* EMF+ emf header info */
- sal_Int32 nBoundsLeft;
- sal_Int32 nBoundsTop;
- sal_Int32 nBoundsRight;
- sal_Int32 nBoundsBottom;
sal_Int32 nFrameLeft;
sal_Int32 nFrameTop;
sal_Int32 nFrameRight;
diff --git a/cppcanvas/source/mtfrenderer/emfplus.cxx b/cppcanvas/source/mtfrenderer/emfplus.cxx
index 384dd2c..a88ae12 100644
--- a/cppcanvas/source/mtfrenderer/emfplus.cxx
+++ b/cppcanvas/source/mtfrenderer/emfplus.cxx
@@ -865,6 +865,9 @@ namespace cppcanvas
x -= nFrameLeft;
y -= nFrameTop;
+ x *= aBaseTransform.eM11;
+ y *= aBaseTransform.eM22;
+
return ::basegfx::B2DPoint (x, y);
}
@@ -877,6 +880,9 @@ namespace cppcanvas
MapToDevice (w, h);
+ w *= aBaseTransform.eM11;
+ h *= aBaseTransform.eM22;
+
return ::basegfx::B2DSize (w, h);
}
@@ -927,6 +933,7 @@ namespace cppcanvas
::basegfx::B2DHomMatrix aTextureTransformation;
::basegfx::B2DHomMatrix aWorldTransformation;
+ ::basegfx::B2DHomMatrix aBaseTransformation;
rendering::Texture aTexture;
aWorldTransformation.set (0, 0, aWorldTransform.eM11);
@@ -936,6 +943,13 @@ namespace cppcanvas
aWorldTransformation.set (1, 1, aWorldTransform.eM22);
aWorldTransformation.set (1, 2, aWorldTransform.eDy);
+ aBaseTransformation.set (0, 0, aBaseTransform.eM11);
+ aBaseTransformation.set (0, 1, aBaseTransform.eM21);
+ aBaseTransformation.set (0, 2, aBaseTransform.eDx);
+ aBaseTransformation.set (1, 0, aBaseTransform.eM12);
+ aBaseTransformation.set (1, 1, aBaseTransform.eM22);
+ aBaseTransformation.set (1, 2, aBaseTransform.eDy);
+
if (brush->type == 4) {
aTextureTransformation.scale (brush->areaWidth, brush->areaHeight);
aTextureTransformation.translate (brush->areaX, brush->areaY);
@@ -962,6 +976,7 @@ namespace cppcanvas
aTextureTransformation.scale (100.0*nMmX/nPixX, 100.0*nMmY/nPixY);
aTextureTransformation.translate (-nFrameLeft, -nFrameTop);
aTextureTransformation *= rState.mapModeTransform;
+ aTextureTransformation *= aBaseTransformation;
aTexture.RepeatModeX = rendering::TexturingMode::CLAMP;
aTexture.RepeatModeY = rendering::TexturingMode::CLAMP;
diff --git a/cppcanvas/source/mtfrenderer/implrenderer.cxx b/cppcanvas/source/mtfrenderer/implrenderer.cxx
index 17c68c4..c9489afd 100644
--- a/cppcanvas/source/mtfrenderer/implrenderer.cxx
+++ b/cppcanvas/source/mtfrenderer/implrenderer.cxx
@@ -1787,12 +1787,13 @@ namespace cppcanvas
SvMemoryStream rMF ((void*) pAct->GetData (), pAct->GetDataSize (), STREAM_READ);
- rMF >> nBoundsLeft >> nBoundsTop >> nBoundsRight >> nBoundsBottom;
- SAL_INFO ("cppcanvas.emf", "EMF+ picture bounds: " << nBoundsLeft << "," << nBoundsTop << " - " << nBoundsRight << "," << nBoundsBottom);
rMF >> nFrameLeft >> nFrameTop >> nFrameRight >> nFrameBottom;
SAL_INFO ("cppcanvas.emf", "EMF+ picture frame: " << nFrameLeft << "," << nFrameTop << " - " << nFrameRight << "," << nFrameBottom);
rMF >> nPixX >> nPixY >> nMmX >> nMmY;
SAL_INFO ("cppcanvas.emf", "EMF+ ref device pixel size: " << nPixX << "x" << nPixY << " mm size: " << nMmX << "x" << nMmY);
+
+ rMF >> aBaseTransform;
+ //aWorldTransform.Set (aBaseTransform);
}
}
break;
diff --git a/vcl/source/filter/wmf/winmtf.cxx b/vcl/source/filter/wmf/winmtf.cxx
index ff7fc2e..0972dcd 100644
--- a/vcl/source/filter/wmf/winmtf.cxx
+++ b/vcl/source/filter/wmf/winmtf.cxx
@@ -2233,24 +2233,26 @@ void WinMtfOutput::PassEMFPlusHeaderInfo()
EMFP_DEBUG(printf ("\t\t\tadd EMF_PLUS header info\n"));
SvMemoryStream mem;
- sal_Int32 nDevLeft, nDevRight, nDevTop, nDevBottom;
sal_Int32 nLeft, nRight, nTop, nBottom;
- nDevLeft = mrclBounds.Left();
- nDevRight = mrclBounds.Right();
- nDevTop = mrclBounds.Top();
- nDevBottom = mrclBounds.Bottom();
-
nLeft = mrclFrame.Left();
nTop = mrclFrame.Top();
nRight = mrclFrame.Right();
nBottom = mrclFrame.Bottom();
// emf header info
- mem << nDevLeft << nDevTop << nDevRight << nDevBottom;
mem << nLeft << nTop << nRight << nBottom;
mem << mnPixX << mnPixY << mnMillX << mnMillY;
+ float one, zero;
+
+ one = 1;
+ zero = 0;
+
+ // add transformation matrix to be used in vcl's metaact.cxx for
+ // rotate and scale operations
+ mem << one << zero << zero << one << zero << zero;
+
// need to flush the stream, otherwise GetEndOfData will return 0
// on windows where the function parameters are probably resolved in reverse order
mem.Flush();
commit f8426f505316d08f35d8a7cf8dbfd6a3c60db3db
Author: Krisztian Pinter <pin.terminator at gmail.com>
Date: Wed Aug 14 15:53:13 2013 +0200
startcenter: Add toggle to view templates in Start Center
Change-Id: I17aa3bfbb7f4b0eca525dd15d6866c6951d5d20f
Reviewed-on: https://gerrit.libreoffice.org/5543
Reviewed-by: Jan Holesovsky <kendy at suse.cz>
Tested-by: Jan Holesovsky <kendy at suse.cz>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 951445b..dcbd8a1 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -482,6 +482,9 @@
<glade-widget-class title="Recent Documents View" name="sfxlo-RecentDocsView"
generic-name="Icon View" parent="GtkIconView"
icon-name="widget-gtk-iconview"/>
+ <glade-widget-class title="Template Thumbnail View" name="sfxlo-TemplateLocalView"
+ generic-name="Template Icon View" parent="GtkIconView"
+ icon-name="widget-gtk-iconview"/>
</glade-widget-classes>
</glade-catalog>
diff --git a/include/sfx2/templateabstractview.hxx b/include/sfx2/templateabstractview.hxx
index 8dd6027..8648205 100644
--- a/include/sfx2/templateabstractview.hxx
+++ b/include/sfx2/templateabstractview.hxx
@@ -81,8 +81,8 @@ class SFX2_DLLPUBLIC TemplateAbstractView : public ThumbnailView
public:
TemplateAbstractView (Window *pParent, WinBits nWinStyle, bool bDisableTransientChildren);
-
TemplateAbstractView ( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false );
+ TemplateAbstractView ( Window* pParent );
virtual ~TemplateAbstractView ();
diff --git a/include/sfx2/templatelocalview.hxx b/include/sfx2/templatelocalview.hxx
index 3a53fcb..139fa70 100644
--- a/include/sfx2/templatelocalview.hxx
+++ b/include/sfx2/templatelocalview.hxx
@@ -30,6 +30,7 @@ class SFX2_DLLPUBLIC TemplateLocalView : public TemplateAbstractView
public:
TemplateLocalView ( Window* pParent, const ResId& rResId, bool bDisableTransientChildren = false );
+ TemplateLocalView ( Window* pParent );
virtual ~TemplateLocalView ();
diff --git a/sfx2/source/control/templateabstractview.cxx b/sfx2/source/control/templateabstractview.cxx
index d911917..9eb0a01 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -142,6 +142,18 @@ TemplateAbstractView::TemplateAbstractView(Window *pParent, const ResId &rResId,
maFTName.Hide();
}
+TemplateAbstractView::TemplateAbstractView(Window *pParent)
+ : ThumbnailView(pParent),
+ mnCurRegionId(0),
+ maAllButton(this, SfxResId(BTN_ALL_TEMPLATES)),
+ maFTName(this, SfxResId(FT_NAME))
+{
+ maAllButton.Hide();
+ maAllButton.SetStyle(maAllButton.GetStyle() | WB_FLATBUTTON);
+ maAllButton.SetClickHdl(LINK(this,TemplateAbstractView,ShowRootRegionHdl));
+ maFTName.Hide();
+}
+
TemplateAbstractView::~TemplateAbstractView ()
{
}
diff --git a/sfx2/source/control/templatelocalview.cxx b/sfx2/source/control/templatelocalview.cxx
index 8dcbd32..bcc0d7d 100644
--- a/sfx2/source/control/templatelocalview.cxx
+++ b/sfx2/source/control/templatelocalview.cxx
@@ -16,6 +16,7 @@
#include <svl/inettype.hxx>
#include <tools/urlobj.hxx>
#include <unotools/ucbstreamhelper.hxx>
+#include <vcl/builder.hxx>
#include <vcl/pngread.hxx>
#include <com/sun/star/embed/ElementModes.hpp>
@@ -37,6 +38,17 @@ TemplateLocalView::TemplateLocalView ( Window* pParent, const ResId& rResId, boo
{
}
+TemplateLocalView::TemplateLocalView ( Window* pParent)
+ : TemplateAbstractView(pParent),
+ mpDocTemplates(new SfxDocumentTemplates)
+{
+}
+
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeTemplateLocalView(Window *pParent, VclBuilder::stringmap &)
+{
+ return new TemplateLocalView(pParent);
+}
+
TemplateLocalView::~TemplateLocalView()
{
for (size_t i = 0; i < maRegions.size(); ++i)
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index d69b2fb..4cedf1b 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -31,6 +31,8 @@
#include <toolkit/awt/vclxmenu.hxx>
+#include <com/sun/star/document/MacroExecMode.hpp>
+#include <com/sun/star/document/UpdateDocMode.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
@@ -38,11 +40,13 @@
#include <com/sun/star/system/SystemShellExecute.hpp>
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
+#include <com/sun/star/task/InteractionHandler.hpp>
+using namespace ::com::sun::star;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star;
+using namespace ::com::sun::star::document;
const char RECENT_FILE_LIST[] = ".uno:RecentFileList";
@@ -60,8 +64,15 @@ const int nItemId_Extensions = 1;
const int nItemId_Info = 3;
const int nItemId_TplRep = 4;
+const int nTemplateItemMaxWidth = 160;
+const int nTemplateItemMaxHeight = 148;
+const int nTemplateItemPadding = 5;
+const int nTemplateItemMaxTextLength = 20;
+const int nTemplateItemThumbnailMaxHeight = 96;
+
BackingWindow::BackingWindow( Window* i_pParent ) :
Window( i_pParent ),
+ mxDesktop( Desktop::create(comphelper::getProcessComponentContext()) ),
mbInitControls( false ),
mnHideExternalLinks( 0 ),
mpAccExec( NULL )
@@ -93,6 +104,16 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
get(mpInfoButton, "info");
get(mpTplRepButton, "add_temp");
+ get(mpShowWriterTemplateButton, "show_writer_template");
+ get(mpShowCalcTemplateButton, "show_calc_template");
+ get(mpShowImpressTemplateButton, "show_impress_template");
+ get(mpShowDrawTemplateButton, "show_draw_template");
+
+ get(mpShowWriterRecentButton, "show_writer_recent");
+ get(mpShowCalcRecentButton, "show_calc_recent");
+ get(mpShowImpressRecentButton, "show_impress_recent");
+ get(mpShowDrawRecentButton, "show_draw_recent");
+
get( mpAllRecentThumbnails, "all_recent");
get( mpWriterRecentThumbnails, "writer_recent");
get( mpCalcRecentThumbnails, "calc_recent");
@@ -101,6 +122,11 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
get( mpDatabaseRecentThumbnails, "database_recent");
get( mpMathRecentThumbnails, "math_recent");
+ get( mpWriterTemplateThumbnails, "writer_templates");
+ get( mpCalcTemplateThumbnails, "calc_templates");
+ get( mpImpressTemplateThumbnails, "impress_templates");
+ get( mpDrawTemplateThumbnails, "draw_templates");
+
try
{
mxContext.set( ::comphelper::getProcessComponentContext(), uno::UNO_SET_THROW );
@@ -158,6 +184,10 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
BackingWindow::~BackingWindow()
{
+ mpWriterTemplateThumbnails ->setOpenTemplateHdl(Link());
+ mpCalcTemplateThumbnails ->setOpenTemplateHdl(Link());
+ mpImpressTemplateThumbnails ->setOpenTemplateHdl(Link());
+ mpDrawTemplateThumbnails ->setOpenTemplateHdl(Link());
}
IMPL_LINK( BackingWindow, WindowEventListener, VclSimpleEvent*, pEvent )
@@ -247,6 +277,26 @@ void BackingWindow::initControls()
setupExternalLink( mpInfoButton );
setupExternalLink( mpTplRepButton );
+ mpShowWriterTemplateButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+ mpShowCalcTemplateButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+ mpShowImpressTemplateButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+ mpShowDrawTemplateButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+
+ mpShowWriterRecentButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+ mpShowCalcRecentButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+ mpShowImpressRecentButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+ mpShowDrawRecentButton ->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+
+ mpShowWriterRecentButton ->Hide();
+ mpShowCalcRecentButton ->Hide();
+ mpShowImpressRecentButton ->Hide();
+ mpShowDrawRecentButton ->Hide();
+
+ setupTemplateView( mpWriterTemplateThumbnails, FILTER_APP_WRITER );
+ setupTemplateView( mpCalcTemplateThumbnails, FILTER_APP_CALC );
+ setupTemplateView( mpImpressTemplateThumbnails, FILTER_APP_IMPRESS );
+ setupTemplateView( mpDrawTemplateThumbnails, FILTER_APP_DRAW );
+
Resize();
}
@@ -281,6 +331,20 @@ void BackingWindow::setupButton( PushButton* pButton )
pButton->SetControlFont( aFont );
}
+void BackingWindow::setupTemplateView( TemplateLocalView* pView, FILTER_APPLICATION eFilter )
+{
+ pView->SetStyle(pView->GetStyle() | WB_VSCROLL);
+ pView->setItemMaxTextLength(nTemplateItemMaxTextLength);
+
+ pView->setItemDimensions(nTemplateItemMaxWidth, nTemplateItemThumbnailMaxHeight,
+ nTemplateItemMaxHeight-nTemplateItemMaxHeight, nTemplateItemPadding);
+ pView->filterItems(ViewFilter_Application(eFilter));
+ pView->Populate();
+ pView->Hide(); // hidden by default
+ pView->showRootRegion();
+ pView->setOpenTemplateHdl( LINK( this, BackingWindow, OpenTemplateHdl ) );
+}
+
void BackingWindow::setupExternalLink( PushButton* pButton )
{
if( mnHideExternalLinks == 0 )
@@ -441,6 +505,96 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
return 0;
}
+IMPL_LINK( BackingWindow, RecentTemplateToggleHdl, Button*, pButton )
+{
+ // writer
+ if( pButton == mpShowWriterTemplateButton )
+ {
+ mpWriterRecentThumbnails->Hide();
+ mpWriterTemplateThumbnails->Show();
+ mpShowWriterTemplateButton->Hide();
+ mpShowWriterRecentButton->Show();
+ }
+ else if( pButton == mpShowWriterRecentButton )
+ {
+ mpWriterRecentThumbnails->Show();
+ mpWriterTemplateThumbnails->Hide();
+ mpShowWriterTemplateButton->Show();
+ mpShowWriterRecentButton->Hide();
+ }
+ // calc
+ else if( pButton == mpShowCalcTemplateButton )
+ {
+ mpCalcRecentThumbnails->Hide();
+ mpCalcTemplateThumbnails->Show();
+ mpShowCalcTemplateButton->Hide();
+ mpShowCalcRecentButton->Show();
+ }
+ else if( pButton == mpShowCalcRecentButton )
+ {
+ mpCalcRecentThumbnails->Show();
+ mpCalcTemplateThumbnails->Hide();
+ mpShowCalcTemplateButton->Show();
+ mpShowCalcRecentButton->Hide();
+ }
+ // impress
+ else if( pButton == mpShowImpressTemplateButton )
+ {
+ mpImpressRecentThumbnails->Hide();
+ mpImpressTemplateThumbnails->Show();
+ mpShowImpressTemplateButton->Hide();
+ mpShowImpressRecentButton->Show();
+ }
+ else if( pButton == mpShowImpressRecentButton )
+ {
+ mpImpressRecentThumbnails->Show();
+ mpImpressTemplateThumbnails->Hide();
+ mpShowImpressTemplateButton->Show();
+ mpShowImpressRecentButton->Hide();
+ }
+ // draw
+ else if( pButton == mpShowDrawTemplateButton )
+ {
+ mpDrawRecentThumbnails->Hide();
+ mpDrawTemplateThumbnails->Show();
+ mpShowDrawTemplateButton->Hide();
+ mpShowDrawRecentButton->Show();
+ }
+ else if( pButton == mpShowDrawRecentButton )
+ {
+ mpDrawRecentThumbnails->Show();
+ mpDrawTemplateThumbnails->Hide();
+ mpShowDrawTemplateButton->Show();
+ mpShowDrawRecentButton->Hide();
+ }
+ return 0;
+}
+
+IMPL_LINK( BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem)
+{
+ uno::Sequence< PropertyValue > aArgs(4);
+ aArgs[0].Name = "AsTemplate";
+ aArgs[0].Value <<= sal_True;
+ aArgs[1].Name = "MacroExecutionMode";
+ aArgs[1].Value <<= MacroExecMode::USE_CONFIG;
+ aArgs[2].Name = "UpdateDocMode";
+ aArgs[2].Value <<= UpdateDocMode::ACCORDING_TO_CONFIG;
+ aArgs[3].Name = "InteractionHandler";
+ aArgs[3].Value <<= task::InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), 0 );
+
+ TemplateViewItem *pTemplateItem = static_cast<TemplateViewItem*>(pItem);
+
+ try
+ {
+ mxDesktop->loadComponentFromURL(pTemplateItem->getPath(),"_default", 0, aArgs );
+ }
+ catch( const uno::Exception& )
+ {
+ }
+
+ return 0;
+}
+
struct ImplDelayedDispatch
{
Reference< XDispatch > xDispatch;
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index 9bacbc8..5009df8 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -28,6 +28,8 @@
#include <vcl/layout.hxx>
#include <sfx2/recentdocsview.hxx>
+#include <sfx2/templatelocalview.hxx>
+#include <sfx2/templateviewitem.hxx>
#include <svtools/acceleratorexecute.hxx>
#include <unotools/moduleoptions.hxx>
@@ -36,6 +38,7 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XDesktop.hpp>
#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XDesktop2.hpp>
#include <set>
@@ -46,6 +49,7 @@ class BackingWindow
com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > mxContext;
com::sun::star::uno::Reference<com::sun::star::frame::XDispatchProvider > mxDesktopDispatchProvider;
com::sun::star::uno::Reference<com::sun::star::frame::XFrame> mxFrame;
+ com::sun::star::uno::Reference< com::sun::star::frame::XDesktop2 > mxDesktop;
PushButton* mpOpenButton;
PushButton* mpTemplateButton;
@@ -70,6 +74,16 @@ class BackingWindow
PushButton* mpInfoButton;
PushButton* mpTplRepButton;
+ PushButton* mpShowWriterTemplateButton;
+ PushButton* mpShowCalcTemplateButton;
+ PushButton* mpShowImpressTemplateButton;
+ PushButton* mpShowDrawTemplateButton;
+
+ PushButton* mpShowWriterRecentButton;
+ PushButton* mpShowCalcRecentButton;
+ PushButton* mpShowImpressRecentButton;
+ PushButton* mpShowDrawRecentButton;
+
RecentDocsView* mpAllRecentThumbnails;
RecentDocsView* mpWriterRecentThumbnails;
RecentDocsView* mpCalcRecentThumbnails;
@@ -78,6 +92,11 @@ class BackingWindow
RecentDocsView* mpDatabaseRecentThumbnails;
RecentDocsView* mpMathRecentThumbnails;
+ TemplateLocalView* mpWriterTemplateThumbnails;
+ TemplateLocalView* mpCalcTemplateThumbnails;
+ TemplateLocalView* mpImpressTemplateThumbnails;
+ TemplateLocalView* mpDrawTemplateThumbnails;
+
Rectangle maStartCentButtons;
bool mbInitControls;
@@ -88,6 +107,7 @@ class BackingWindow
const OUString& rURL, const std::set<OUString>& rURLS, SvtModuleOptions& rOpt,
SvtModuleOptions::EModule eMod );
void setupButton( PushButton* pButton );
+ void setupTemplateView( TemplateLocalView* pView, FILTER_APPLICATION eFilter );
void setupExternalLink( PushButton* pButton );
void dispatchURL( const OUString& i_rURL,
@@ -97,6 +117,8 @@ class BackingWindow
);
DECL_LINK( ClickHdl, Button* );
+ DECL_LINK( RecentTemplateToggleHdl, Button* );
+ DECL_LINK( OpenTemplateHdl, ThumbnailViewItem* );
DECL_LINK( ExtLinkClickHdl, Button* );
DECL_LINK( WindowEventListener, VclSimpleEvent* );
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 2274155..9285bf9 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -7,6 +7,52 @@
<property name="can_focus">False</property>
<property name="pixbuf">framework/res/addtemplate_32.png</property>
</object>
+ <object class="GtkImage" id="calc_all_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/ods_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="calc_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/ods_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="database_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/odb_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="database_all_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/odb_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="draw_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/odg_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="draw_all_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">res/odg_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="extension_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">framework/res/extension.png</property>
+ </object>
+ <object class="GtkImage" id="impress_all_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">New Presentation</property>
+ <property name="pixbuf">res/odp_32_8.png</property>
+ </object>
+ <object class="GtkImage" id="info_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="pixbuf">framework/res/info_26.png</property>
+ </object>
<object class="GtkBox" id="StartCenter">
<property name="can_focus">False</property>
<child>
@@ -187,6 +233,47 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_writer_template">
+ <property name="label" translatable="yes">Show Templates</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_writer_recent">
+ <property name="label" translatable="yes">Show Recent</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -196,11 +283,39 @@
</packing>
</child>
<child>
- <object class="sfxlo-RecentDocsView" id="writer_recent">
+ <object class="GtkGrid" id="grid21">
<property name="visible">True</property>
- <property name="can_focus">True</property>
+ <property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child>
+ <object class="sfxlo-RecentDocsView" id="writer_recent">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-TemplateLocalView" id="writer_templates">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -251,6 +366,47 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_calc_template">
+ <property name="label" translatable="yes">Show Templates</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_calc_recent">
+ <property name="label" translatable="yes">Show Recent</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -260,11 +416,39 @@
</packing>
</child>
<child>
- <object class="sfxlo-RecentDocsView" id="calc_recent">
+ <object class="GtkGrid" id="grid20">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child>
+ <object class="sfxlo-RecentDocsView" id="calc_recent">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-TemplateLocalView" id="calc_templates">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -315,6 +499,47 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label10">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_impress_template">
+ <property name="label" translatable="yes">Show Templates</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_impress_recent">
+ <property name="label" translatable="yes">Show Recent</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -324,11 +549,39 @@
</packing>
</child>
<child>
- <object class="sfxlo-RecentDocsView" id="impress_recent">
+ <object class="GtkGrid" id="grid18">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child>
+ <object class="sfxlo-RecentDocsView" id="impress_recent">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-TemplateLocalView" id="impress_templates">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -379,6 +632,47 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_draw_template">
+ <property name="label" translatable="yes">Show Templates</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="show_draw_recent">
+ <property name="label" translatable="yes">Show Recent</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -388,11 +682,39 @@
</packing>
</child>
<child>
- <object class="sfxlo-RecentDocsView" id="draw_recent">
+ <object class="GtkGrid" id="grid19">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="vexpand">True</property>
+ <child>
+ <object class="sfxlo-RecentDocsView" id="draw_recent">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="sfxlo-TemplateLocalView" id="draw_templates">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
@@ -696,57 +1018,11 @@
</packing>
</child>
</object>
- <object class="GtkImage" id="calc_all_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/ods_32_8.png</property>
- </object>
- <object class="GtkImage" id="calc_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/ods_32_8.png</property>
- </object>
- <object class="GtkImage" id="database_all_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/odb_32_8.png</property>
- </object>
- <object class="GtkImage" id="database_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/odb_32_8.png</property>
- </object>
- <object class="GtkImage" id="draw_all_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/odg_32_8.png</property>
- </object>
- <object class="GtkImage" id="draw_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">res/odg_32_8.png</property>
- </object>
- <object class="GtkImage" id="extension_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">framework/res/extension.png</property>
- </object>
- <object class="GtkImage" id="impress_all_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">New Presentation</property>
- <property name="pixbuf">res/odp_32_8.png</property>
- </object>
<object class="GtkImage" id="impress_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/odp_32_8.png</property>
</object>
- <object class="GtkImage" id="info_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="pixbuf">framework/res/info_26.png</property>
- </object>
<object class="GtkImage" id="math_all_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -767,12 +1043,12 @@
<property name="can_focus">False</property>
<property name="pixbuf">framework/res/templates_32.png</property>
</object>
- <object class="GtkImage" id="writer_all_image">
+ <object class="GtkImage" id="writer_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/odt_32_8.png</property>
</object>
- <object class="GtkImage" id="writer_image">
+ <object class="GtkImage" id="writer_all_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="pixbuf">res/odt_32_8.png</property>
commit 40ff64b93fc4c4c2e2710853e9f71e35811b9362
Author: Eike Rathke <erack at redhat.com>
Date: Fri Aug 30 13:54:02 2013 +0200
and another one for fdo#68740
Change-Id: If07cffd30fe5fdfbe8fcb749b7682d1b8a3dcbb8
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index 8c95f2a..d40f4b8 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -459,7 +459,7 @@ void start_language_section(
LanguageType ltype = LanguageTag(
OStringToOUString( iso_lang.language(), RTL_TEXTENCODING_UTF8),
- OStringToOUString( iso_lang.country(), RTL_TEXTENCODING_UTF8)).getLanguageType();
+ OStringToOUString( iso_lang.country(), RTL_TEXTENCODING_UTF8)).makeFallback().getLanguageType();
char buff[10];
int primLangID = PRIMARYLANGID(ltype);
commit 9f1d47f8246b5513fa3a54ff16de4b1f4dd647ab
Author: Eike Rathke <erack at redhat.com>
Date: Fri Aug 30 13:23:32 2013 +0200
attempt to roughly fix fdo#68740
Actually that map wants a resolved fallback locale, not just a language
to ID mapping, which light fallback was a side effect of
MsLangId::convertIsoNamesToLanguage() and eliminated with the latest
changes to LanguageTag conversion.
Change-Id: I32f632c6b198383dd3eda8538ccb801c9275baca
diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx
index ea326c7..8c95f2a 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -330,7 +330,7 @@ void add_group_entries(
iso_lang_identifier myiso_lang( iso_lang );
LanguageType ltype = LanguageTag(
OStringToOUString( myiso_lang.language(), RTL_TEXTENCODING_UTF8),
- OStringToOUString( myiso_lang.country(), RTL_TEXTENCODING_UTF8)).getLanguageType();
+ OStringToOUString( myiso_lang.country(), RTL_TEXTENCODING_UTF8)).makeFallback().getLanguageType();
if( ( ltype & 0x0200 ) == 0 && map[ ltype ].empty() )
{
Substitutor.set_language(iso_lang_identifier(iso_lang));
commit 74929bba736cc6cceed3c088e13f5952abb1bd2b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Thu Aug 29 20:44:22 2013 +0100
Related: fdo#38838 remove UniString::ToUpperAscii
things got a little out of hand and I ended up
converting quite a bit of calc to OUString
Change-Id: I056326d37ffefa8c120cb2e564d166dd9f20f216
diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx
index d1bdcfe..6913c41 100644
--- a/include/svx/hlnkitem.hxx
+++ b/include/svx/hlnkitem.hxx
@@ -39,7 +39,7 @@ enum SvxLinkInsertMode
class SVX_DLLPUBLIC SvxHyperlinkItem : public SfxPoolItem
{
- String sName;
+ OUString sName;
String sURL;
String sTarget;
SvxLinkInsertMode eType;
@@ -69,8 +69,8 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 );
- const String& GetName() const { return sName; }
- void SetName(const String& rName) { sName = rName; }
+ const OUString& GetName() const { return sName; }
+ void SetName(const OUString& rName) { sName = rName; }
const String& GetURL() const { return sURL; }
void SetURL(const String& rURL) { sURL = rURL; }
diff --git a/include/tools/string.hxx b/include/tools/string.hxx
index 7b8793c..c26fee3 100644
--- a/include/tools/string.hxx
+++ b/include/tools/string.hxx
@@ -227,7 +227,6 @@ public:
UniString Copy( xub_StrLen nIndex = 0, xub_StrLen nCount = STRING_LEN ) const;
UniString& ToLowerAscii();
- UniString& ToUpperAscii();
StringCompare CompareTo( const UniString& rStr,
xub_StrLen nLen = STRING_LEN ) const;
diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx
index 2a38827..e998de0 100644
--- a/sc/inc/address.hxx
+++ b/sc/inc/address.hxx
@@ -293,9 +293,7 @@ public:
const ::com::sun::star::uno::Sequence<
const ::com::sun::star::sheet::ExternalLinkInfo > * pExternalLinks = NULL );
- SC_DLLPUBLIC void Format( OUString&, sal_uInt16 = 0, const ScDocument* = NULL,
- const Details& rDetails = detailsOOOa1) const;
- SC_DLLPUBLIC void Format( String&, sal_uInt16 = 0, const ScDocument* = NULL,
+ SC_DLLPUBLIC OUString Format( sal_uInt16 = 0, const ScDocument* = NULL,
const Details& rDetails = detailsOOOa1) const;
// The document for the maximum defined sheet number
@@ -494,11 +492,8 @@ public:
const ::com::sun::star::uno::Sequence<
const ::com::sun::star::sheet::ExternalLinkInfo > * pExternalLinks = NULL );
- SC_DLLPUBLIC void Format( String&, sal_uInt16 = 0, const ScDocument* = NULL,
- const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ) const;
-
- SC_DLLPUBLIC void Format( OUString&, sal_uInt16 = 0, const ScDocument* = NULL,
- const ScAddress::Details& rDetails = ScAddress::detailsOOOa1 ) const;
+ SC_DLLPUBLIC OUString Format(sal_uInt16 = 0, const ScDocument* = NULL,
+ const ScAddress::Details& rDetails = ScAddress::detailsOOOa1) const;
inline void GetVars( SCCOL& nCol1, SCROW& nRow1, SCTAB& nTab1,
SCCOL& nCol2, SCROW& nRow2, SCTAB& nTab2 ) const;
@@ -785,14 +780,14 @@ bool ConvertDoubleRef(ScDocument* pDoc, const String& rRefString,
/// append alpha representation of column to buffer
SC_DLLPUBLIC void ScColToAlpha( OUStringBuffer& rBuffer, SCCOL nCol);
-inline void ScColToAlpha( String& rStr, SCCOL nCol)
+inline void ScColToAlpha( OUString& rStr, SCCOL nCol)
{
OUStringBuffer aBuf(2);
ScColToAlpha( aBuf, nCol);
- rStr.Append( aBuf.getStr(), static_cast<xub_StrLen>(aBuf.getLength()));
+ rStr += aBuf.makeStringAndClear();
}
-inline String ScColToAlpha( SCCOL nCol )
+inline OUString ScColToAlpha( SCCOL nCol )
{
OUStringBuffer aBuf(2);
ScColToAlpha( aBuf, nCol);
diff --git a/sc/inc/rangeseq.hxx b/sc/inc/rangeseq.hxx
index b13233d..64e9f6c 100644
--- a/sc/inc/rangeseq.hxx
+++ b/sc/inc/rangeseq.hxx
@@ -98,7 +98,7 @@ class ScByteSequenceToString
public:
// rAny must contain Sequence<sal_Int8>,
// may or may not contain 0-bytes at the end
- static sal_Bool GetString( String& rString, const com::sun::star::uno::Any& rAny,
+ static sal_Bool GetString( OUString& rString, const com::sun::star::uno::Any& rAny,
sal_uInt16 nEncoding );
};
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 4ed2092..ab227ea 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -3194,8 +3194,7 @@ namespace {
bool checkFormulaPosition(ScDocument& rDoc, const ScAddress& rPos)
{
- OUString aStr;
- rPos.Format(aStr, SCA_VALID);
+ OUString aStr(rPos.Format(SCA_VALID));
const ScFormulaCell* pFC = rDoc.GetFormulaCell(rPos);
if (!pFC)
{
@@ -3205,8 +3204,7 @@ bool checkFormulaPosition(ScDocument& rDoc, const ScAddress& rPos)
if (pFC->aPos != rPos)
{
- OUString aStr2;
- pFC->aPos.Format(aStr2, SCA_VALID);
+ OUString aStr2(pFC->aPos.Format(SCA_VALID));
cerr << "Formula cell at " << aStr << " has incorrect position of " << aStr2 << endl;
return false;
}
@@ -3224,8 +3222,7 @@ void checkFormulaPositions(ScDocument& rDoc, const ScAddress& rPos, const SCROW*
if (!checkFormulaPosition(rDoc, aPos))
{
- OUString aStr;
- aPos.Format(aStr, SCA_VALID);
+ OUString aStr(aPos.Format(SCA_VALID));
std::ostringstream os;
os << "Formula cell position failed at " << aStr;
CPPUNIT_FAIL(os.str().c_str());
diff --git a/sc/qa/unit/ucalc_pivottable.cxx b/sc/qa/unit/ucalc_pivottable.cxx
index 28d0e92..a052adc 100644
--- a/sc/qa/unit/ucalc_pivottable.cxx
+++ b/sc/qa/unit/ucalc_pivottable.cxx
@@ -710,8 +710,7 @@ void Test::testPivotTableNamedSource()
// Insert the raw data.
ScRange aSrcRange = insertDPSourceData(m_pDoc, aFields, nFieldCount, aData, nDataCount);
- OUString aRangeStr;
- aSrcRange.Format(aRangeStr, SCR_ABS_3D, m_pDoc);
+ OUString aRangeStr(aSrcRange.Format(SCR_ABS_3D, m_pDoc));
// Name this range.
OUString aRangeName("MyData");
@@ -2133,8 +2132,7 @@ void Test::testFuncGETPIVOTDATA()
aPos = aOutRange.aEnd;
aPos.IncRow(2); // Move 2 rows down from the table outout.
- OUString aPivotPosStr;
- aOutRange.aStart.Format(aPivotPosStr, SCA_ABS);
+ OUString aPivotPosStr(aOutRange.aStart.Format(SCA_ABS));
sc::AutoCalcSwitch aSwitch(*m_pDoc, true); // turn autocalc on.
@@ -2195,7 +2193,7 @@ void Test::testFuncGETPIVOTDATA()
aPos = aOutRange.aEnd;
aPos.IncRow(2); // move 2 rows down from the output.
- aOutRange.aStart.Format(aPivotPosStr, SCA_ABS);
+ aPivotPosStr = aOutRange.aStart.Format(SCA_ABS);
// First, get the grand totals.
aFormula = ("=GETPIVOTDATA(\"Sum - Value\";") + aPivotPosStr + ")";
diff --git a/sc/qa/unit/ucalc_sharedformula.cxx b/sc/qa/unit/ucalc_sharedformula.cxx
index 39e5176..169c576 100644
--- a/sc/qa/unit/ucalc_sharedformula.cxx
+++ b/sc/qa/unit/ucalc_sharedformula.cxx
@@ -419,8 +419,7 @@ void Test::testSharedFormulasCopyPaste()
// Paste them to C2:C10.
ScRange aDestRange(2,1,0,2,9,0);
- OUString aRS;
- aDestRange.Format(aRS, SCR_ABS);
+ OUString aRS(aDestRange.Format(SCR_ABS));
pasteFromClip(m_pDoc, aDestRange, &aClipDoc);
aPos.SetCol(2);
aPos.SetRow(1);
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index 80bc01a..ce572b9 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -481,10 +481,8 @@ SfxItemPresentation ScRangeItem::GetPresentation
case SFX_ITEM_PRESENTATION_NAMELESS:
{
- String aText;
/* Always use OOo:A1 format */
- aRange.Format( aText );
- rText += aText;
+ rText += aRange.Format();
}
break;
diff --git a/sc/source/core/data/dpcache.cxx b/sc/source/core/data/dpcache.cxx
index abaf088..5d2e50a 100644
--- a/sc/source/core/data/dpcache.cxx
+++ b/sc/source/core/data/dpcache.cxx
@@ -114,9 +114,7 @@ OUString createLabelString(ScDocument* pDoc, SCCOL nCol, SCROW nRow, SCTAB nTab)
aBuf.append(sal_Unicode(' '));
ScAddress aColAddr(nCol, 0, 0);
- OUString aColStr;
- aColAddr.Format(aColStr, SCA_VALID_COL, NULL);
- aBuf.append(aColStr);
+ aBuf.append(aColAddr.Format(SCA_VALID_COL, NULL));
aDocStr = aBuf.makeStringAndClear();
}
return aDocStr;
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 32238cd..2ca77d1 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -2005,13 +2005,12 @@ sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos ) const
else
{
#if OSL_DEBUG_LEVEL > 0
- OUString aTmp;
OStringBuffer aMsg(RTL_CONSTASCII_STRINGPARAM(
"broken Matrix, no MatFormula at origin, Pos: "));
- aPos.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument );
+ OUString aTmp(aPos.Format(SCA_VALID_COL | SCA_VALID_ROW, pDocument));
aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_ASCII_US));
aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatOrg: "));
- aOrg.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument );
+ aTmp = aOrg.Format(SCA_VALID_COL | SCA_VALID_ROW, pDocument);
aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_ASCII_US));
OSL_FAIL(aMsg.getStr());
#endif
@@ -2038,12 +2037,11 @@ sal_uInt16 ScFormulaCell::GetMatrixEdge( ScAddress& rOrgPos ) const
#if OSL_DEBUG_LEVEL > 0
else
{
- OUString aTmp;
OStringBuffer aMsg( "broken Matrix, Pos: " );
- aPos.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument );
+ OUString aTmp(aPos.Format(SCA_VALID_COL | SCA_VALID_ROW, pDocument));
aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8 ));
aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatOrg: "));
- aOrg.Format( aTmp, SCA_VALID_COL | SCA_VALID_ROW, pDocument );
+ aTmp = aOrg.Format(SCA_VALID_COL | SCA_VALID_ROW, pDocument);
aMsg.append(OUStringToOString(aTmp, RTL_TEXTENCODING_UTF8 ));
aMsg.append(RTL_CONSTASCII_STRINGPARAM(", MatCols: "));
aMsg.append(static_cast<sal_Int32>( nC ));
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index e471e85..d6342e0 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -206,9 +206,8 @@ sal_Bool ScValidationData::DoScript( const ScAddress& rPos, const String& rInput
aParams[0] = ::com::sun::star::uno::makeAny( OUString( aValStr ) );
// 2) Position der Zelle
- String aPosStr;
- rPos.Format( aPosStr, SCA_VALID | SCA_TAB_3D, pDocument, pDocument->GetAddressConvention() );
- aParams[1] = ::com::sun::star::uno::makeAny( OUString( aPosStr ) );
+ OUString aPosStr(rPos.Format(SCA_VALID | SCA_TAB_3D, pDocument, pDocument->GetAddressConvention()));
+ aParams[1] = ::com::sun::star::uno::makeAny(aPosStr);
// use link-update flag to prevent closing the document
// while the macro is running
@@ -329,8 +328,7 @@ sal_Bool ScValidationData::DoMacro( const ScAddress& rPos, const String& rInput,
refPar->Get(1)->PutString( aValStr );
// 2) Position der Zelle
- String aPosStr;
- rPos.Format( aPosStr, SCA_VALID | SCA_TAB_3D, pDocument, pDocument->GetAddressConvention() );
+ OUString aPosStr(rPos.Format(SCA_VALID | SCA_TAB_3D, pDocument, pDocument->GetAddressConvention()));
refPar->Get(2)->PutString( aPosStr );
// use link-update flag to prevent closing the document
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 6906c87..0a3d919 100644
--- a/sc/source/core/tool/address.cxx
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list