[Libreoffice-commits] core.git: 217 commits - android/sdremote avmedia/source basctl/source basic/CppunitTest_basic_scanner.mk basic/source bin/benchmark-document-loading bridges/source codemaker/source comphelper/source config_host.mk.in configure.ac connectivity/Rdb_postgresql-sdbc.mk connectivity/source cppuhelper/source cui/AllLangResTarget_cui.mk cui/source cui/uiconfig cui/UIConfig_cui.mk curl/curl-7.26.0_strlcat.patch curl/UnpackedTarball_curl.mk dbaccess/qa dbaccess/source editeng/source extras/CustomTarget_autocorr.mk extras/Package_autocorr.mk extras/source fpicker/source framework/source helpcontent2 i18nlangtag/qa i18nlangtag/README i18nlangtag/source i18npool/source icon-themes/galaxy idlc/source include/apple_remote include/basic include/codemaker include/comphelper include/connectivity include/editeng include/i18nlangtag include/linguistic include/oox include/svtools include/svx include/tools include/unoidl include/vcl instsetoo_native/CustomTarget_setup.mk instsetoo_native /util ios/CustomTarget_LibreOffice_app.mk ios/iosremote jurt/CustomTarget_jnilib.mk jurt/Module_jurt.mk jurt/Package_jnilib.mk l10ntools/inc l10ntools/source lingucomponent/source linguistic/source lotuswordpro/source mysqlc/source nss/ExternalProject_nss.mk nss/nss_macosx.patch offapi/com oox/source openssl/ExternalProject_openssl.mk postprocess/packimages postprocess/Rdb_services.mk python3/ExternalProject_python3.mk python3/python-3.3.0-darwin.patch.1 pyuno/Rdb_pyuno.mk reportbuilder/java RepositoryFixes.mk rsc/source sal/osl sal/qa sc/inc scp2/inc scp2/InstallModule_ooo.mk scp2/source sc/qa scripting/Rdb_scriptproviderforbeanshell.mk scripting/Rdb_scriptproviderforjavascript.mk sc/source sd/source sd/uiconfig sfx2/inc sfx2/source solenv/bin solenv/gbuild svgio/inc svgio/source svtools/inc svtools/source svx/source sw/inc sw/qa sw/source sw/uiconfig sw/UIConfig_swriter.mk toolkit/source tools/source unodevtools/source unoidl/Library_unoidl.mk unoidl/source unotools/source unusedcode.easy ure/Rdb_ure.mk vcl/coretext vcl/ios vcl/source vcl/win wizards/source xmloff/source
Minh Ngo
nlminhtl at gmail.com
Sun Sep 15 17:22:51 PDT 2013
RepositoryFixes.mk | 10
android/sdremote/res/drawable-nodpi/slide_unknown.png |binary
android/sdremote/res/layout/action_bar_computer_creation.xml | 4
android/sdremote/res/layout/activity_requirements.xml | 6
android/sdremote/res/layout/fragment_computers_list.xml | 2
android/sdremote/res/layout/fragment_slides_pager.xml | 2
android/sdremote/src/org/libreoffice/impressremote/activity/ComputerConnectionActivity.java | 10
android/sdremote/src/org/libreoffice/impressremote/activity/ComputerCreationActivity.java | 10
android/sdremote/src/org/libreoffice/impressremote/activity/ComputersActivity.java | 4
android/sdremote/src/org/libreoffice/impressremote/activity/SettingsActivity.java | 2
android/sdremote/src/org/libreoffice/impressremote/activity/SlideShowActivity.java | 52
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServerConnection.java | 41
android/sdremote/src/org/libreoffice/impressremote/communication/BluetoothServersFinder.java | 6
android/sdremote/src/org/libreoffice/impressremote/communication/CommunicationService.java | 204
android/sdremote/src/org/libreoffice/impressremote/communication/PairingProvider.java | 8
android/sdremote/src/org/libreoffice/impressremote/communication/Server.java | 11
android/sdremote/src/org/libreoffice/impressremote/communication/ServerConnection.java | 6
android/sdremote/src/org/libreoffice/impressremote/communication/SlideShow.java | 22
android/sdremote/src/org/libreoffice/impressremote/communication/TcpServerConnection.java | 46
android/sdremote/src/org/libreoffice/impressremote/communication/TcpServersFinder.java | 1
android/sdremote/src/org/libreoffice/impressremote/communication/Timer.java | 43
android/sdremote/src/org/libreoffice/impressremote/fragment/ComputerConnectionFragment.java | 122
android/sdremote/src/org/libreoffice/impressremote/fragment/ComputersFragment.java | 164
android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesGridFragment.java | 4
android/sdremote/src/org/libreoffice/impressremote/fragment/SlidesPagerFragment.java | 33
android/sdremote/src/org/libreoffice/impressremote/util/FragmentOperator.java | 54
android/sdremote/src/org/libreoffice/impressremote/util/Fragments.java | 43
android/sdremote/src/org/libreoffice/impressremote/util/Intents.java | 6
android/sdremote/src/org/libreoffice/impressremote/util/Preferences.java | 38
android/sdremote/src/org/libreoffice/impressremote/util/SavedStates.java | 19
android/sdremote/src/org/libreoffice/impressremote/view/CapsTextView.java | 34
avmedia/source/vlc/vlcframegrabber.cxx | 33
avmedia/source/vlc/vlcframegrabber.hxx | 28
avmedia/source/vlc/vlcmanager.cxx | 12
avmedia/source/vlc/vlcmanager.hxx | 4
avmedia/source/vlc/vlcplayer.cxx | 48
avmedia/source/vlc/vlcplayer.hxx | 22
avmedia/source/vlc/vlcwindow.cxx | 62
avmedia/source/vlc/vlcwindow.hxx | 7
avmedia/source/vlc/wrapper/Common.cxx | 21
avmedia/source/vlc/wrapper/Common.hxx | 9
avmedia/source/vlc/wrapper/EventHandler.cxx | 9
avmedia/source/vlc/wrapper/EventHandler.hxx | 13
avmedia/source/vlc/wrapper/EventManager.cxx | 36
avmedia/source/vlc/wrapper/EventManager.hxx | 17
avmedia/source/vlc/wrapper/Instance.cxx | 25
avmedia/source/vlc/wrapper/Instance.hxx | 8
avmedia/source/vlc/wrapper/Media.cxx | 65
avmedia/source/vlc/wrapper/Media.hxx | 10
avmedia/source/vlc/wrapper/Player.cxx | 109
avmedia/source/vlc/wrapper/Player.hxx | 15
avmedia/source/vlc/wrapper/SymbolLoader.hxx | 16
avmedia/source/vlc/wrapper/ThreadsafeQueue.hxx | 11
avmedia/source/vlc/wrapper/Types.hxx | 6
basctl/source/basicide/basides1.cxx | 3
basic/CppunitTest_basic_scanner.mk | 2
basic/source/classes/propacc.cxx | 9
basic/source/classes/sbunoobj.cxx | 11
basic/source/classes/sbxmod.cxx | 3
basic/source/comp/symtbl.cxx | 5
basic/source/inc/date.hxx | 15
basic/source/inc/parser.hxx | 3
basic/source/runtime/methods.cxx | 200
basic/source/runtime/methods1.cxx | 4
basic/source/runtime/rtlproto.hxx | 6
basic/source/runtime/runtime.cxx | 2
basic/source/runtime/stdobj.cxx | 12
basic/source/sbx/sbxvalue.cxx | 2
bin/benchmark-document-loading | 506 +
bridges/source/cpp_uno/shared/vtablefactory.cxx | 4
codemaker/source/codemaker/typemanager.cxx | 8
codemaker/source/cppumaker/cppumaker.cxx | 26
codemaker/source/cppumaker/cppuoptions.cxx | 36
codemaker/source/cppumaker/cpputype.cxx | 15
codemaker/source/javamaker/javamaker.cxx | 4
comphelper/source/misc/expandmacro.cxx | 24
config_host.mk.in | 2
configure.ac | 253
connectivity/Rdb_postgresql-sdbc.mk | 4
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 10
connectivity/source/commontools/dbconversion.cxx | 2
connectivity/source/commontools/dbexception.cxx | 124
connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx | 10
connectivity/source/drivers/ado/AResultSet.cxx | 10
connectivity/source/drivers/evoab2/NResultSet.cxx | 10
connectivity/source/drivers/file/FResultSet.cxx | 12
connectivity/source/drivers/firebird/Connection.cxx | 6
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 37
connectivity/source/drivers/firebird/PreparedStatement.cxx | 1
connectivity/source/drivers/firebird/ResultSet.cxx | 12
connectivity/source/drivers/firebird/Table.cxx | 8
connectivity/source/drivers/kab/KResultSet.cxx | 13
connectivity/source/drivers/macab/MacabResultSet.cxx | 14
connectivity/source/drivers/mork/MResultSet.cxx | 9
connectivity/source/drivers/mozab/MResultSet.cxx | 9
connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx | 10
connectivity/source/drivers/odbcbase/OResultSet.cxx | 10
connectivity/source/drivers/postgresql/pq_resultset.cxx | 7
connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx | 10
connectivity/source/parse/sqlbison.y | 69
connectivity/source/parse/sqliterator.cxx | 29
connectivity/source/sdbcx/VCollection.cxx | 8
cppuhelper/source/typemanager.cxx | 10
cppuhelper/source/typemanager.hxx | 7
cui/AllLangResTarget_cui.mk | 1
cui/UIConfig_cui.mk | 3
cui/source/dialogs/cuigaldlg.cxx | 4
cui/source/dialogs/hlinettp.cxx | 2
cui/source/dialogs/hlmailtp.cxx | 27
cui/source/factory/dlgfact.cxx | 11
cui/source/inc/connect.hxx | 41
cui/source/inc/cuigaldlg.hxx | 2
cui/source/inc/cuires.hrc | 3
cui/source/inc/helpid.hrc | 3
cui/source/inc/measure.hxx | 2
cui/source/tabpages/connect.cxx | 268
cui/source/tabpages/connect.hrc | 39
cui/source/tabpages/connect.src | 233
cui/source/tabpages/measure.cxx | 17
cui/source/tabpages/numpages.cxx | 22
cui/source/tabpages/strings.src | 8
cui/uiconfig/ui/connectortabpage.ui | 392 +
cui/uiconfig/ui/dimensionlines.ui | 471 -
cui/uiconfig/ui/dimensionlinestabpage.ui | 471 +
curl/UnpackedTarball_curl.mk | 1
curl/curl-7.26.0_strlcat.patch | 9
dbaccess/qa/unit/firebird.cxx | 2
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 7
dbaccess/source/ui/browser/formadapter.cxx | 6
dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx | 2
editeng/source/editeng/editdoc.cxx | 40
editeng/source/editeng/editdoc.hxx | 16
editeng/source/items/borderline.cxx | 4
editeng/source/items/frmitems.cxx | 2
editeng/source/items/numitem.cxx | 2
editeng/source/misc/svxacorr.cxx | 12
extras/CustomTarget_autocorr.mk | 48
extras/Package_autocorr.mk | 8
extras/source/autotext/lang/sh-ME/acor/DocumentList.xml | 17
extras/source/autotext/lang/sh-ME/acor/META-INF/manifest.xml | 8
extras/source/autotext/lang/sh-ME/acor/SentenceExceptList.xml | 82
extras/source/autotext/lang/sh-ME/acor/WordExceptList.xml | 9
extras/source/autotext/lang/sh-RS/acor/DocumentList.xml | 17
extras/source/autotext/lang/sh-RS/acor/META-INF/manifest.xml | 8
extras/source/autotext/lang/sh-RS/acor/SentenceExceptList.xml | 82
extras/source/autotext/lang/sh-RS/acor/WordExceptList.xml | 9
extras/source/autotext/lang/sh-YU/acor/DocumentList.xml | 17
extras/source/autotext/lang/sh-YU/acor/META-INF/manifest.xml | 8
extras/source/autotext/lang/sh-YU/acor/SentenceExceptList.xml | 82
extras/source/autotext/lang/sh-YU/acor/WordExceptList.xml | 9
extras/source/autotext/lang/sr-CS/acor/DocumentList.xml | 14
extras/source/autotext/lang/sr-CS/acor/META-INF/manifest.xml | 8
extras/source/autotext/lang/sr-CS/acor/SentenceExceptList.xml | 82
extras/source/autotext/lang/sr-CS/acor/WordExceptList.xml | 6
extras/source/autotext/lang/sr-Latn-CS/acor/DocumentList.xml | 17
extras/source/autotext/lang/sr-Latn-CS/acor/META-INF/manifest.xml | 8
extras/source/autotext/lang/sr-Latn-CS/acor/SentenceExceptList.xml | 82
extras/source/autotext/lang/sr-Latn-CS/acor/WordExceptList.xml | 9
extras/source/autotext/lang/sr-Latn-ME/acor/DocumentList.xml | 17
extras/source/autotext/lang/sr-Latn-ME/acor/META-INF/manifest.xml | 8
extras/source/autotext/lang/sr-Latn-ME/acor/SentenceExceptList.xml | 82
extras/source/autotext/lang/sr-Latn-ME/acor/WordExceptList.xml | 9
extras/source/autotext/lang/sr-Latn-RS/acor/DocumentList.xml | 17
extras/source/autotext/lang/sr-Latn-RS/acor/META-INF/manifest.xml | 8
extras/source/autotext/lang/sr-Latn-RS/acor/SentenceExceptList.xml | 82
extras/source/autotext/lang/sr-Latn-RS/acor/WordExceptList.xml | 9
extras/source/autotext/lang/sr-YU/acor/DocumentList.xml | 14
extras/source/autotext/lang/sr-YU/acor/META-INF/manifest.xml | 8
extras/source/autotext/lang/sr-YU/acor/SentenceExceptList.xml | 82
extras/source/autotext/lang/sr-YU/acor/WordExceptList.xml | 6
extras/source/glade/libreoffice-catalog.xml.in | 20
fpicker/source/office/iodlg.cxx | 16
fpicker/source/office/iodlgimp.cxx | 2
fpicker/source/office/iodlgimp.hxx | 8
framework/source/uiconfiguration/imagemanagerimpl.cxx | 7
framework/source/xml/imagesdocumenthandler.cxx | 7
helpcontent2 | 2
i18nlangtag/README | 23
i18nlangtag/qa/cppunit/test_languagetag.cxx | 52
i18nlangtag/source/isolang/isolang.cxx | 37
i18nlangtag/source/languagetag/languagetag.cxx | 97
i18npool/source/characterclassification/cclass_unicode_parser.cxx | 13
icon-themes/galaxy/sc/res/icon-set-negative-red-smilie.png |binary
icon-themes/galaxy/sc/res/icon-set-negative-yellow-smilie.png |binary
icon-themes/galaxy/sc/res/icon-set-neutral-yellow-smilie.png |binary
icon-themes/galaxy/sc/res/icon-set-positive-green-smilie.png |binary
icon-themes/galaxy/sc/res/icon-set-positive-yellow-smilie.png |binary
idlc/source/fehelper.cxx | 4
idlc/source/idlccompile.cxx | 4
include/apple_remote/RemoteControl.h | 6
include/apple_remote/RemoteMainController.h | 6
include/basic/sbuno.hxx | 6
include/basic/sbxvar.hxx | 2
include/codemaker/typemanager.hxx | 2
include/comphelper/expandmacro.hxx | 23
include/connectivity/dbexception.hxx | 57
include/connectivity/sqliterator.hxx | 5
include/editeng/borderline.hxx | 3
include/editeng/tstpitem.hxx | 5
include/i18nlangtag/lang.h | 1
include/linguistic/misc.hxx | 4
include/oox/crypto/DocumentDecryption.hxx | 2
include/oox/crypto/Standard2007Engine.hxx | 5
include/svtools/ruler.hxx | 75
include/svtools/tabbar.hxx | 6
include/svx/connctrl.hxx | 11
include/svx/measctrl.hxx | 1
include/svx/ruler.hxx | 19
include/svx/rulritem.hxx | 104
include/tools/solar.h | 1
include/tools/string.hxx | 4
include/unoidl/sourceprovider.hxx | 48
include/vcl/button.hxx | 1
instsetoo_native/CustomTarget_setup.mk | 6
instsetoo_native/util/openoffice.lst.in | 12
ios/CustomTarget_LibreOffice_app.mk | 10
ios/iosremote/PopoverView.h | 12
ios/iosremote/PopoverView.m | 12
ios/iosremote/PopoverViewCompatibility.h | 14
ios/iosremote/PopoverView_Configuration.h | 14
ios/iosremote/en.lproj/iPad_autosize.storyboard | 75
ios/iosremote/en.lproj/iPad_autosize.strings |binary
ios/iosremote/en.lproj/iPad_autosize_old.storyboard | 77
ios/iosremote/fr.lproj/iPad_autosize.storyboard | 77
ios/iosremote/fr.lproj/iPad_autosize_old.storyboard | 77
ios/iosremote/iosremote.xcodeproj/project.pbxproj | 66
ios/iosremote/iosremote/AboutViewController.h | 15
ios/iosremote/iosremote/AboutViewController.m | 48
ios/iosremote/iosremote/AppDelegate.h | 2
ios/iosremote/iosremote/AppDelegate.m | 2
ios/iosremote/iosremote/BasePresentationViewController.m | 18
ios/iosremote/iosremote/Timer.m | 11
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.storyboard | 114
ios/iosremote/iosremote/en.lproj/iPhone_autoSize.strings |binary
ios/iosremote/iosremote/en.lproj/iPhone_autoSize_old.storyboard | 114
ios/iosremote/iosremote/fr.lproj/iPhone_autoSize.storyboard | 114
ios/iosremote/iosremote/fr.lproj/iPhone_autoSize_old.storyboard | 114
ios/iosremote/iosremote/more_ipad.png |binary
ios/iosremote/iosremote/more_ipad at 2x.png |binary
ios/iosremote/iosremote/serverList_vc.h | 6
ios/iosremote/iosremote/serverList_vc.m | 24
ios/iosremote/iosremote/slideShowPreviewTable_vc.m | 9
ios/iosremote/iosremote/slideShowSwipeInList_iphone.m | 2
ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize.storyboard | 114
ios/iosremote/iosremote/zh-Hans.lproj/iPhone_autoSize_old.storyboard | 114
ios/iosremote/libreoffice_logo.png |binary
ios/iosremote/licenses.html | 51
ios/iosremote/zh-Hans.lproj/iPad_autosize.storyboard | 77
ios/iosremote/zh-Hans.lproj/iPad_autosize_old.storyboard | 77
jurt/CustomTarget_jnilib.mk | 22
jurt/Module_jurt.mk | 7
jurt/Package_jnilib.mk | 14
l10ntools/inc/common.hxx | 2
l10ntools/inc/export.hxx | 4
l10ntools/source/common.cxx | 9
l10ntools/source/export.cxx | 8
l10ntools/source/merge.cxx | 4
lingucomponent/source/lingutil/lingutil.cxx | 20
linguistic/source/convdic.cxx | 3
linguistic/source/convdiclist.cxx | 10
linguistic/source/dlistimp.cxx | 8
linguistic/source/misc.cxx | 13
lotuswordpro/source/filter/tocread.cxx | 2
mysqlc/source/mysqlc_resultset.cxx | 8
nss/ExternalProject_nss.mk | 2
nss/nss_macosx.patch | 11
offapi/com/sun/star/sdbc/XColumnLocate.idl | 12
oox/source/core/filterbase.cxx | 3
oox/source/core/filterdetect.cxx | 4
oox/source/core/xmlfilterbase.cxx | 4
oox/source/crypto/DocumentDecryption.cxx | 47
oox/source/crypto/Standard2007Engine.cxx | 39
oox/source/ppt/presentationfragmenthandler.cxx | 6
openssl/ExternalProject_openssl.mk | 23
postprocess/Rdb_services.mk | 4
postprocess/packimages/README | 2
python3/ExternalProject_python3.mk | 4
python3/python-3.3.0-darwin.patch.1 | 11
pyuno/Rdb_pyuno.mk | 4
reportbuilder/java/org/libreoffice/report/SDBCReportDataFactory.java | 98
rsc/source/rscpp/cpp6.c | 1
sal/osl/unx/time.c | 4
sal/qa/rtl/oustring/rtl_OUString2.cxx | 6
sc/inc/cellvalue.hxx | 3
sc/inc/colorscale.hxx | 2
sc/inc/dociter.hxx | 4
sc/inc/mtvelements.hxx | 3
sc/qa/unit/helper/qahelper.cxx | 1
sc/source/core/data/attrib.cxx | 4
sc/source/core/data/cellvalue.cxx | 29
sc/source/core/data/colorscale.cxx | 12
sc/source/core/data/dociter.cxx | 18
sc/source/core/data/mtvelements.cxx | 25
sc/source/filter/excel/excform.cxx | 26
sc/source/filter/excel/excimp8.cxx | 2
sc/source/filter/excel/impop.cxx | 11
sc/source/filter/excel/read.cxx | 5
sc/source/filter/excel/xicontent.cxx | 19
sc/source/filter/excel/xihelper.cxx | 13
sc/source/filter/excel/xipivot.cxx | 32
sc/source/filter/excel/xiroot.cxx | 7
sc/source/filter/inc/xicontent.hxx | 2
sc/source/filter/inc/xihelper.hxx | 2
sc/source/filter/inc/xipivot.hxx | 8
sc/source/filter/inc/xiroot.hxx | 6
sc/source/filter/oox/workbookhelper.cxx | 39
sc/source/ui/dbgui/scendlg.cxx | 40
sc/source/ui/inc/anyrefdg.hxx | 4
sc/source/ui/inc/iconsets.hrc | 5
sc/source/ui/inc/scendlg.hxx | 6
sc/source/ui/inc/tabcont.hxx | 3
sc/source/ui/miscdlgs/anyrefdg.cxx | 8
sc/source/ui/src/condformatdlg.src | 2
sc/source/ui/src/iconsets.src | 20
sc/source/ui/view/printfun.cxx | 2
sc/source/ui/view/tabcont.cxx | 69
scp2/InstallModule_ooo.mk | 1
scp2/inc/macros.inc | 2
scp2/source/base/postgresqlsdbc.scp | 2
scp2/source/extensions/file_extensions.scp | 12
scp2/source/ooo/file_ooo.scp | 12
scp2/source/ooo/shortcut_ooo.scp | 37
scp2/source/ooo/ure.scp | 16
scp2/source/python/file_python.scp | 2
scripting/Rdb_scriptproviderforbeanshell.mk | 4
scripting/Rdb_scriptproviderforjavascript.mk | 4
sd/source/core/CustomAnimationPreset.cxx | 14
sd/source/core/TransitionPreset.cxx | 14
sd/source/core/drawdoc.cxx | 6
sd/source/core/drawdoc3.cxx | 85
sd/source/filter/html/htmlex.cxx | 3
sd/source/filter/html/pubdlg.cxx | 44
sd/source/filter/ppt/pptanimations.hxx | 9
sd/source/filter/sdpptwrp.cxx | 2
sd/source/filter/xml/sdxmlwrp.cxx | 4
sd/uiconfig/simpress/ui/customanimationspanel.ui | 605 -
sd/uiconfig/simpress/ui/slidetransitionspanel.ui | 508 -
sfx2/inc/bluthsndapi.hxx | 4
sfx2/inc/inettbc.hxx | 8
sfx2/inc/pch/precompiled_sfx.hxx | 2
sfx2/source/appl/appcfg.cxx | 2
sfx2/source/appl/fileobj.hxx | 1
sfx2/source/appl/helpinterceptor.hxx | 1
sfx2/source/appl/impldde.hxx | 2
sfx2/source/appl/newhelp.cxx | 4
sfx2/source/appl/openuriexternally.cxx | 1
sfx2/source/dialog/filedlghelper.cxx | 2
sfx2/source/doc/doctempl.cxx | 1
sfx2/source/doc/oleprops.hxx | 3
sfx2/source/inc/appdata.hxx | 6
sfx2/source/inc/helper.hxx | 3
solenv/bin/macosx-change-install-names.pl | 2
solenv/bin/macosx-create-bundle | 95
solenv/bin/modules/SourceConfig.pm | 57
solenv/bin/modules/installer.pm | 13
solenv/bin/modules/installer/archivefiles.pm | 8
solenv/bin/modules/installer/converter.pm | 16
solenv/bin/modules/installer/environment.pm | 6
solenv/bin/modules/installer/epmfile.pm | 56
solenv/bin/modules/installer/globals.pm | 10
solenv/bin/modules/installer/languages.pm | 22
solenv/bin/modules/installer/scriptitems.pm | 56
solenv/bin/modules/installer/systemactions.pm | 32
solenv/bin/modules/installer/windows/assembly.pm | 30
solenv/bin/modules/installer/windows/directory.pm | 1
solenv/bin/modules/installer/windows/feature.pm | 30
solenv/bin/modules/installer/windows/file.pm | 1
solenv/bin/modules/installer/windows/media.pm | 116
solenv/bin/modules/installer/windows/msiglobal.pm | 3
solenv/bin/modules/installer/windows/msp.pm | 14
solenv/bin/modules/installer/windows/update.pm | 2
solenv/bin/modules/installer/worker.pm | 129
solenv/bin/modules/packager/check.pm | 79
solenv/bin/modules/packager/exiter.pm | 62
solenv/bin/modules/packager/files.pm | 175
solenv/bin/modules/packager/globals.pm | 45
solenv/bin/modules/packager/work.pm | 118
solenv/bin/modules/par2script/work.pm | 2
solenv/bin/modules/pre2par/language.pm | 1
solenv/bin/modules/t/packager-work.t | 45
solenv/bin/packager.pl | 51
solenv/gbuild/AllLangResTarget.mk | 3
solenv/gbuild/CustomTarget.mk | 2
solenv/gbuild/GeneratedPackage.mk | 6
solenv/gbuild/Helper.mk | 6
solenv/gbuild/LinkTarget.mk | 6
solenv/gbuild/Pagein.mk | 11
solenv/gbuild/Rdb.mk | 29
solenv/gbuild/platform/macosx.mk | 5
solenv/gbuild/platform/mingw.mk | 3
svgio/inc/svgio/svgreader/svgsvgnode.hxx | 4
svgio/source/svgreader/svgclippathnode.cxx | 2
svgio/source/svgreader/svggnode.cxx | 2
svgio/source/svgreader/svgmasknode.cxx | 2
svgio/source/svgreader/svgsvgnode.cxx | 4
svgio/source/svgreader/svgusenode.cxx | 2
svtools/inc/pch/precompiled_svt.hxx | 1
svtools/source/contnr/contentenumeration.hxx | 1
svtools/source/control/ctrlbox.cxx | 4
svtools/source/control/ruler.cxx | 733 --
svtools/source/control/tabbar.cxx | 34
svtools/source/control/valueimp.hxx | 1
svtools/source/java/javainteractionhandler.cxx | 1
svtools/source/misc/langtab.src | 1
svtools/source/svhtml/htmlkywd.cxx | 3
svtools/source/svrtf/rtfkeywd.cxx | 3
svtools/source/svrtf/rtfout.cxx | 1
svx/source/dialog/connctrl.cxx | 155
svx/source/dialog/measctrl.cxx | 29
svx/source/dialog/rulritem.cxx | 484 -
svx/source/dialog/sendreportunx.cxx | 10
svx/source/dialog/svxruler.cxx | 929 +-
svx/source/table/tablelayouter.cxx | 4
svx/source/tbxctrls/tbcontrl.cxx | 2
sw/UIConfig_swriter.mk | 2
sw/inc/dbui.hrc | 18
sw/inc/fmtrfmrk.hxx | 2
sw/inc/helpid.h | 3
sw/inc/swtypes.hxx | 8
sw/qa/extras/inc/swmodeltestbase.hxx | 10
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 2
sw/source/core/access/parachangetrackinginfo.cxx | 2
sw/source/core/bastyp/init.cxx | 9
sw/source/core/doc/SwStyleNameMapper.cxx | 4
sw/source/core/doc/docdde.cxx | 10
sw/source/core/inc/frmtool.hxx | 10
sw/source/core/inc/swfont.hxx | 31
sw/source/core/inc/txtfrm.hxx | 6
sw/source/core/layout/flylay.cxx | 7
sw/source/core/layout/flypos.cxx | 6
sw/source/core/layout/ftnfrm.cxx | 7
sw/source/core/text/frmcrsr.cxx | 2
sw/source/core/text/frmform.cxx | 14
sw/source/core/text/frminf.cxx | 18
sw/source/core/text/inftxt.cxx | 6
sw/source/core/text/inftxt.hxx | 19
sw/source/core/text/itrform2.cxx | 32
sw/source/core/text/itrtxt.cxx | 2
sw/source/core/text/txtdrop.cxx | 2
sw/source/core/text/txtfrm.cxx | 31
sw/source/core/text/xmldump.cxx | 24
sw/source/core/tox/txmsrt.cxx | 10
sw/source/core/txtnode/atrref.cxx | 2
sw/source/core/txtnode/fntcache.cxx | 10
sw/source/core/txtnode/fntcap.cxx | 40
sw/source/core/txtnode/swfont.cxx | 46
sw/source/core/txtnode/txtedt.cxx | 20
sw/source/filter/html/htmlfly.cxx | 24
sw/source/filter/html/htmlgrin.cxx | 20
sw/source/filter/html/htmlplug.cxx | 4
sw/source/filter/html/htmltabw.cxx | 2
sw/source/filter/html/swhtml.cxx | 18
sw/source/filter/html/wrthtml.cxx | 22
sw/source/filter/ww8/docxattributeoutput.cxx | 285
sw/source/filter/ww8/docxattributeoutput.hxx | 13
sw/source/filter/ww8/rtfattributeoutput.cxx | 14
sw/source/filter/ww8/wrtw8nds.cxx | 2
sw/source/filter/ww8/wrtww8.cxx | 8
sw/source/filter/xml/xmlithlp.cxx | 3
sw/source/ui/dbui/mailmergehelper.cxx | 41
sw/source/ui/dbui/mmaddressblockpage.cxx | 443 -
sw/source/ui/dbui/mmaddressblockpage.hrc | 36
sw/source/ui/dbui/mmaddressblockpage.hxx | 85
sw/source/ui/dbui/mmaddressblockpage.src | 392 -
sw/source/ui/docvw/edtwin2.cxx | 16
sw/source/ui/inc/chrdlgmodes.hxx | 2
sw/source/ui/inc/mailmergehelper.hxx | 8
sw/source/ui/inc/uitool.hxx | 24
sw/source/ui/misc/swruler.cxx | 7
sw/source/ui/uiview/view2.cxx | 23
sw/source/ui/uiview/viewtab.cxx | 29
sw/source/ui/uno/unotxdoc.cxx | 34
sw/source/ui/utlui/content.cxx | 12
sw/source/ui/utlui/uitool.cxx | 4
sw/source/ui/wrtsh/move.cxx | 3
sw/uiconfig/swriter/ui/addressblockdialog.ui | 426 +
sw/uiconfig/swriter/ui/selectblockdialog.ui | 296
toolkit/source/awt/vclxtoolkit.cxx | 10
tools/source/string/strimp.cxx | 66
unodevtools/source/skeletonmaker/skeletonmaker.cxx | 2
unoidl/Library_unoidl.mk | 14
unoidl/source/sourceprovider-parser-requires.hxx | 136
unoidl/source/sourceprovider-parser.y | 3631 ++++++++++
unoidl/source/sourceprovider-scanner.hxx | 247
unoidl/source/sourceprovider-scanner.l | 253
unoidl/source/sourceprovider.cxx | 206
unotools/source/config/lingucfg.cxx | 3
unusedcode.easy | 5
ure/Rdb_ure.mk | 4
vcl/coretext/salgdi2.cxx | 29
vcl/ios/iosinst.cxx | 33
vcl/source/control/button.cxx | 16
vcl/source/control/field.cxx | 14
vcl/source/control/tabctrl.cxx | 2
vcl/source/edit/vclmedit.cxx | 2
vcl/source/window/splitwin.cxx | 17
vcl/source/window/window.cxx | 1
vcl/win/source/gdi/salgdi3.cxx | 24
vcl/win/source/window/salframe.cxx | 12
wizards/source/depot/Depot.xba | 20
wizards/source/depot/Internet.xba | 8
xmloff/source/draw/ximpstyl.cxx | 45
xmloff/source/forms/propertyexport.cxx | 3
xmloff/source/style/chrlohdl.cxx | 5
xmloff/source/style/impastpl.hxx | 2
xmloff/source/text/txtexppr.cxx | 5
xmloff/source/text/txtimppr.cxx | 6
xmloff/source/transform/OOo2Oasis.cxx | 20
xmloff/source/transform/StyleOASISTContext.cxx | 30
xmloff/source/transform/StyleOASISTContext.hxx | 2
xmloff/source/transform/StyleOOoTContext.cxx | 12
xmloff/source/xforms/SchemaContext.cxx | 4
xmloff/source/xforms/SchemaRestrictionContext.cxx | 4
xmloff/source/xforms/SchemaSimpleTypeContext.cxx | 4
xmloff/source/xforms/XFormsBindContext.cxx | 2
xmloff/source/xforms/XFormsInstanceContext.cxx | 2
xmloff/source/xforms/XFormsModelContext.cxx | 4
xmloff/source/xforms/XFormsSubmissionContext.cxx | 2
xmloff/source/xforms/xformsapi.cxx | 2
519 files changed, 13895 insertions(+), 8223 deletions(-)
New commits:
commit bd8f84ceb36954496fd9f053436b0c4a8a5c38db
Author: Minh Ngo <nlminhtl at gmail.com>
Date: Sun Sep 15 23:13:19 2013 +0300
Avmedia/VLC: Falling back to gstreamer if libvlc is not found.
Change-Id: I8d4e3cded0fc8c26a27505b5d51806bbcdeecc93
diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx
index e99416d..085f3c8 100644
--- a/avmedia/source/vlc/vlcmanager.cxx
+++ b/avmedia/source/vlc/vlcmanager.cxx
@@ -9,6 +9,7 @@
#include <boost/algorithm/string.hpp>
#include <boost/lexical_cast.hpp>
+#include <com/sun/star/uno/Exception.hpp>
#include "vlcmanager.hxx"
#include "vlcplayer.hxx"
#include "wrapper/Instance.hxx"
@@ -78,7 +79,7 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUSt
throw (uno::RuntimeException)
{
if ( !m_is_vlc_found )
- return uno::Reference< media::XPlayer >();
+ throw uno::Exception();
if ( !rURL.isEmpty() )
{
@@ -107,15 +108,12 @@ rtl::OUString SAL_CALL Manager::getImplementationName()
sal_Bool SAL_CALL Manager::supportsService( const rtl::OUString& serviceName )
throw (uno::RuntimeException)
{
- return serviceName == VLC_SERVICENAME && m_is_vlc_found;
+ return serviceName == VLC_SERVICENAME;
}
uno::Sequence< rtl::OUString > SAL_CALL Manager::getSupportedServiceNames()
throw (uno::RuntimeException)
{
- if ( !m_is_vlc_found )
- return uno::Sequence< rtl::OUString >();
-
::uno::Sequence< OUString > aRet(1);
aRet[0] = VLC_SERVICENAME;
return aRet;
diff --git a/avmedia/source/vlc/wrapper/SymbolLoader.hxx b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
index b463e75..50f1af4 100644
--- a/avmedia/source/vlc/wrapper/SymbolLoader.hxx
+++ b/avmedia/source/vlc/wrapper/SymbolLoader.hxx
@@ -36,7 +36,7 @@ struct ApiMap
namespace
{
#if defined( UNX )
- const char LibName[] = "libvlc.so.5";
+ const char LibName[] = "libvlc.so";
#elif defined( MACOSX )
const char LibName[] = "/Applications/VLC.app/Contents/MacOS/lib/libvlc.dylib";
#elif defined( WNT )
commit 8f7e45181de4e76256e0dfbb297e6dfdd957e894
Author: Tor Lillqvist <tml at collabora.com>
Date: Sun Sep 15 23:13:54 2013 +0300
WaE: unused parameters
Change-Id: Ie0197bff8260f2f163537a3f9fd8fcf4988b1d91
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index 073fc22..8ef99b3 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -102,7 +102,7 @@ void SAL_CALL VLCWindow::removeEventListener( const uno::Reference< lang::XEvent
{
}
-void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
+void SAL_CALL VLCWindow::setPosSize( sal_Int32 /* X */, sal_Int32 /* Y */, sal_Int32 /* Width */, sal_Int32 /* Height */, sal_Int16 /* Flags */ )
throw (uno::RuntimeException)
{
}
commit 768c41469e5af7a27778b946c6865ebe3a6d5799
Author: Chr. Rossmanith <ChrRossmanith at gmx.de>
Date: Sat Sep 7 15:33:37 2013 +0200
childs -> children (in comments)
Change-Id: Ib91c2b0195f2db5c8a35997d5d07d3c04e9e69b7
diff --git a/svgio/inc/svgio/svgreader/svgsvgnode.hxx b/svgio/inc/svgio/svgreader/svgsvgnode.hxx
index 8455b7c..749cb2f 100644
--- a/svgio/inc/svgio/svgreader/svgsvgnode.hxx
+++ b/svgio/inc/svgio/svgreader/svgsvgnode.hxx
@@ -58,9 +58,9 @@ namespace svgio
virtual void seekReferenceWidth(double& fWidth, bool& bHasFound) const;
virtual void seekReferenceHeight(double& fHeight, bool& bHasFound) const;
- /// InfoProvider support for % values in childs
+ /// InfoProvider support for % values in children
// The returned 'CurrentViewPort' is the viewport as it is set by this svg element
- // and as it is needed to resolve relative values in childs
+ // and as it is needed to resolve relative values in children
// The method does not check for invalid width and height
virtual const basegfx::B2DRange getCurrentViewPort() const;
diff --git a/svgio/source/svgreader/svgclippathnode.cxx b/svgio/source/svgreader/svgclippathnode.cxx
index c0858ce..4c8cce9 100644
--- a/svgio/source/svgreader/svgclippathnode.cxx
+++ b/svgio/source/svgreader/svgclippathnode.cxx
@@ -103,7 +103,7 @@ namespace svgio
{
drawinglayer::primitive2d::Primitive2DSequence aNewTarget;
- // decompose childs
+ // decompose children
SvgNode::decomposeSvgNode(aNewTarget, bReferenced);
if(aNewTarget.hasElements())
diff --git a/svgio/source/svgreader/svggnode.cxx b/svgio/source/svgreader/svggnode.cxx
index 4f3e23b..bd41365 100644
--- a/svgio/source/svgreader/svggnode.cxx
+++ b/svgio/source/svgreader/svggnode.cxx
@@ -94,7 +94,7 @@ namespace svgio
{
drawinglayer::primitive2d::Primitive2DSequence aContent;
- // decompose childs
+ // decompose children
SvgNode::decomposeSvgNode(aContent, bReferenced);
if(aContent.hasElements())
diff --git a/svgio/source/svgreader/svgmasknode.cxx b/svgio/source/svgreader/svgmasknode.cxx
index fc8e307..460b7f4 100644
--- a/svgio/source/svgreader/svgmasknode.cxx
+++ b/svgio/source/svgreader/svgmasknode.cxx
@@ -171,7 +171,7 @@ namespace svgio
{
drawinglayer::primitive2d::Primitive2DSequence aNewTarget;
- // decompose childs
+ // decompose children
SvgNode::decomposeSvgNode(aNewTarget, bReferenced);
if(aNewTarget.hasElements())
diff --git a/svgio/source/svgreader/svgsvgnode.cxx b/svgio/source/svgreader/svgsvgnode.cxx
index 5798fd7..0bf1b45 100644
--- a/svgio/source/svgreader/svgsvgnode.cxx
+++ b/svgio/source/svgreader/svgsvgnode.cxx
@@ -246,7 +246,7 @@ namespace svgio
{
drawinglayer::primitive2d::Primitive2DSequence aSequence;
- // decompose childs
+ // decompose children
SvgNode::decomposeSvgNode(aSequence, bReferenced);
if(aSequence.hasElements())
@@ -697,7 +697,7 @@ namespace svgio
return SvgNode::getCurrentViewPort();
}
}
-// ToDo: Is it possible to decompose and use the bounding box of the childs, if even the
+// ToDo: Is it possible to decompose and use the bounding box of the children, if even the
// outermost svg has no information to resolve percentage? Is it worth, how expensive is it?
}
diff --git a/svgio/source/svgreader/svgusenode.cxx b/svgio/source/svgreader/svgusenode.cxx
index 4db965a..b545c7a 100644
--- a/svgio/source/svgreader/svgusenode.cxx
+++ b/svgio/source/svgreader/svgusenode.cxx
@@ -147,7 +147,7 @@ namespace svgio
if(mpXLink && Display_none != mpXLink->getDisplay())
{
- // decompose childs
+ // decompose children
drawinglayer::primitive2d::Primitive2DSequence aNewTarget;
// todo: in case mpXLink is a SVGTokenSvg or SVGTokenSymbol the
commit f356fd26a10112cc3c475b224d1b5f7486253ed2
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Mon Sep 9 15:13:31 2013 +0200
CharBrd 10: Some documentation
Change-Id: I4c6c2cd4acf8ae4a759a662f92066ad63df74b3c
diff --git a/dictionaries b/dictionaries
index b07ae33..a32a341 160000
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit b07ae33b0d25e33bf890fab8fbcd3317506bbeae
+Subproject commit a32a341efdbb9e53a7b832262a41f6fb6454bedf
diff --git a/sw/qa/extras/inc/swmodeltestbase.hxx b/sw/qa/extras/inc/swmodeltestbase.hxx
index 353cd63..81a4aa2 100644
--- a/sw/qa/extras/inc/swmodeltestbase.hxx
+++ b/sw/qa/extras/inc/swmodeltestbase.hxx
@@ -359,6 +359,16 @@ protected:
sal_uInt32 m_nStartTime;
};
+/**
+ * Test whether the expected and actual borderline parameters are equal
+ * and assert if not.
+ *
+ * @param[in] rExpected expected borderline object
+ * @param[in] rActual actual borderline object
+ * @param[in] rSourceLine line from where the assertion is called
+ * Note: This method is the implementatition of CPPUNIT_ASSERT_BORDER_EQUAL, so
+ * use that macro instead.
+**/
inline void assertBorderEqual(
const table::BorderLine2& rExpected, const table::BorderLine2& rActual,
const CppUnit::SourceLine& rSourceLine )
diff --git a/sw/source/core/inc/frmtool.hxx b/sw/source/core/inc/frmtool.hxx
index b478f55..5519eb0 100644
--- a/sw/source/core/inc/frmtool.hxx
+++ b/sw/source/core/inc/frmtool.hxx
@@ -65,7 +65,15 @@ void SwAlignRect( SwRect &rRect, const ViewShell *pSh );
// Created declaration here to avoid <extern> declarations
void SwAlignGrfRect( SwRect *pGrfRect, const OutputDevice &rOut );
-// Paint character border using frame painting code
+/**
+ * Paint border around a run of characters using frame painting code.
+ *
+ * @param[in] rFont font object of actual text, which specify the border
+ * @param[in] rPaintArea rectangle area in which line portion takes place
+ * @param[in] bVerticalLayout corresponding text frame verticality
+ * @param[in] bJoinWithPrev leave border with which actual border joins to the previous portion
+ * @param[in] bJoinWithNext leave border with which actual border joins to the next portion
+**/
void PaintCharacterBorder(
const SwFont& rFont, const SwRect& rPaintArea, const bool bVerticalLayout,
const bool bJoinWithPrev, const bool bJoinWithNext );
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 4b9821b..f347d20 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -370,7 +370,6 @@ public:
inline void Invalidate()
{ bFntChg = bOrgChg = sal_True; }
- // set/get borders
void SetTopBorder( const editeng::SvxBorderLine* pTopBorder );
void SetBottomBorder( const editeng::SvxBorderLine* pBottomBorder );
void SetRightBorder( const editeng::SvxBorderLine* pRightBorder );
@@ -381,7 +380,7 @@ public:
const boost::optional<editeng::SvxBorderLine>& GetRightBorder() const { return m_aRightBorder; }
const boost::optional<editeng::SvxBorderLine>& GetLeftBorder() const { return m_aLeftBorder; }
- // Get borders which are at absolute positions
+ // Get absolute border correspond to the layout verticality and orientation.
const boost::optional<editeng::SvxBorderLine>& GetAbsTopBorder( const bool bVertLayout ) const;
const boost::optional<editeng::SvxBorderLine>& GetAbsBottomBorder( const bool bVertLayout ) const;
const boost::optional<editeng::SvxBorderLine>& GetAbsRightBorder( const bool bVertLayout ) const;
@@ -397,22 +396,22 @@ public:
sal_uInt16 GetRightBorderDist() const { return m_nRightBorderDist; }
sal_uInt16 GetLeftBorderDist() const { return m_nLeftBorderDist; }
- // Return with the border width plus spacing
+ // Return with the whole space which border holed (border width, spacing and shadow width)
sal_uInt16 GetTopBorderSpace() const;
sal_uInt16 GetBottomBorderSpace() const;
sal_uInt16 GetRightBorderSpace() const;
sal_uInt16 GetLeftBorderSpace() const;
+ /// Check whether font has any border on any side
bool HasBorder() const;
- // Shadow attributes
void SetShadowColor( const Color& rColor );
void SetShadowWidth( const sal_uInt16 nWidth );
void SetShadowLocation( const SvxShadowLocation aLocation );
- const Color& GetShadowColor() const { return m_aShadowColor; }
- sal_uInt16 GetShadowWidth() const { return m_nShadowWidth; }
- SvxShadowLocation GetShadowLocation() const { return m_aShadowLocation; }
+ const Color& GetShadowColor() const { return m_aShadowColor; }
+ sal_uInt16 GetShadowWidth() const { return m_nShadowWidth; }
+ SvxShadowLocation GetShadowLocation() const { return m_aShadowLocation; }
/**
* Get the absolute shadow location dependant from orientation.
diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index df2ccc3..4fadf2a 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -443,6 +443,11 @@ public:
void DrawViewOpt( const SwLinePortion &rPor, const MSHORT nWhich ) const;
void DrawBackBrush( const SwLinePortion &rPor ) const;
+ /**
+ * Draw character border around a line portion.
+ *
+ * @param[in] rPor line portion around which border have to be drawn.
+ **/
void DrawBorder( const SwLinePortion &rPor ) const;
void DrawCheckBox( const SwFieldFormPortion &rPor, bool checked) const;
diff --git a/sw/source/ui/inc/chrdlgmodes.hxx b/sw/source/ui/inc/chrdlgmodes.hxx
index 4cbf007..d60ff0f 100644
--- a/sw/source/ui/inc/chrdlgmodes.hxx
+++ b/sw/source/ui/inc/chrdlgmodes.hxx
@@ -10,7 +10,7 @@
#ifndef SW_CHAR_DLG_MODES_HXX
#define SW_CHAR_DLG_MODES_HXX
-//DialogModes:
+// DialogModes for SwCharDlg
#define DLG_CHAR_STD 0
#define DLG_CHAR_DRAW 1
#define DLG_CHAR_ENV 2
diff --git a/sw/source/ui/inc/uitool.hxx b/sw/source/ui/inc/uitool.hxx
index 85387a2..ecf1783 100644
--- a/sw/source/ui/inc/uitool.hxx
+++ b/sw/source/ui/inc/uitool.hxx
@@ -39,19 +39,29 @@ class SfxViewFrame;
// switch a metric
SW_DLLPUBLIC void SetMetric(MetricFormatter& rCtrl, FieldUnit eUnit);
-// fill BoxInfoAttribut
+// fill BoxInfo attribute
SW_DLLPUBLIC void PrepareBoxInfo(SfxItemSet& rSet, const SwWrtShell& rSh);
// Modes for attribute conversion
#define CONV_ATTR_STD 1 // Standard character dialog
#define CONV_ATTR_ENV 2 // Character dialog opened from envelope dialog
-// Convert character specific attributes to general ones used by tab pages
-SW_DLLPUBLIC void ConvertAttrCharToGen(SfxItemSet& rSet, sal_uInt8 nMode);
-
-// Convert general attributes to the corresponding character attributes
-// This method is used after executed a character dialog
-SW_DLLPUBLIC void ConvertAttrGenToChar(SfxItemSet& rSet, sal_uInt8 nMode);
+/**
+ * Convert character specific attributes to general ones used by tab pages.
+ *
+ * @param[in|out] rSet the set in which character attributes are stored
+ * @param[in] nMode specify the dialog which will be called after conversion
+**/
+SW_DLLPUBLIC void ConvertAttrCharToGen(SfxItemSet& rSet, const sal_uInt8 nMode);
+
+/**
+ * Convert general attributes to the corresponding character attributes.
+ * This method is used after executed a character dialog.
+ *
+ * @param[in|out] rSet the set in which character attributes are stored
+ * @param[in] nMode specify the dialog which was called before
+**/
+SW_DLLPUBLIC void ConvertAttrGenToChar(SfxItemSet& rSet, const sal_uInt8 nMode);
// SfxItemSets <-> PageDesc
void ItemSetToPageDesc( const SfxItemSet& rSet, SwPageDesc& rPageDesc );
diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx
index 455e738..5409b2f 100644
--- a/sw/source/ui/utlui/uitool.cxx
+++ b/sw/source/ui/utlui/uitool.cxx
@@ -119,7 +119,7 @@ void PrepareBoxInfo(SfxItemSet& rSet, const SwWrtShell& rSh)
rSet.Put(aBoxInfo);
}
-void ConvertAttrCharToGen(SfxItemSet& rSet, sal_uInt8 nMode)
+void ConvertAttrCharToGen(SfxItemSet& rSet, const sal_uInt8 nMode)
{
// Background
{
@@ -159,7 +159,7 @@ void ConvertAttrCharToGen(SfxItemSet& rSet, sal_uInt8 nMode)
}
}
-void ConvertAttrGenToChar(SfxItemSet& rSet, sal_uInt8 nMode)
+void ConvertAttrGenToChar(SfxItemSet& rSet, const sal_uInt8 nMode)
{
// Background
{
diff --git a/xmloff/source/text/txtexppr.cxx b/xmloff/source/text/txtexppr.cxx
index 12a72a5..ec4e439 100644
--- a/xmloff/source/text/txtexppr.cxx
+++ b/xmloff/source/text/txtexppr.cxx
@@ -336,6 +336,11 @@ lcl_checkMultiProperty(XMLPropertyState *const pState,
}
}
+/**
+ * Filter context of paragraph and character borders.
+ * Compress border attriubtes. If one of groupable attributes (border type, border width, padding)
+ * is equal for all four side then just one general attribute will be exported.
+**/
static void lcl_FilterBorders(
XMLPropertyState* pAllBorderWidthState, XMLPropertyState* pLeftBorderWidthState,
XMLPropertyState* pRightBorderWidthState, XMLPropertyState* pTopBorderWidthState,
diff --git a/xmloff/source/text/txtimppr.cxx b/xmloff/source/text/txtimppr.cxx
index 1e7ec03..cff85ac 100644
--- a/xmloff/source/text/txtimppr.cxx
+++ b/xmloff/source/text/txtimppr.cxx
@@ -268,6 +268,12 @@ isNotDefaultRelSize(const XMLPropertyState* pRelState, const UniReference<XMLPro
return true;
}
+/**
+ * Separate compressed border attributes.
+ * During export, border attributes are compressed if there are equal to all four side.
+ * Since Writer hasn't the same compressed attributes, but has distinct ones for all
+ * four side, we have to duplicate the compressed attribute during import.
+**/
static void lcl_SeparateBorder(
sal_uInt16 nIndex, XMLPropertyState* pAllBorderDistance,
XMLPropertyState* pBorderDistances[4], XMLPropertyState* pNewBorderDistances[4],
commit e37a33f5743ab8f3e31a919586842f6f8952d381
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Thu Sep 12 12:52:51 2013 +0200
In some case character border merge is called twice
Change-Id: I206b3a448b45c918070bb73074bea79e94231297
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index 05d6854..0b9074f 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -2639,11 +2639,15 @@ void SwTxtFormatter::MergeCharacterBorder( SwLinePortion& rPortion, SwTxtFormatI
// The current portion isn't inserted into the portion chain yet, so the info's
// last portion will be the previous one
if( rInf.GetLast() && rInf.GetLast() != &rPortion && // For para portion (special case)
- rInf.GetLast()->GetJoinBorderWithNext())
+ rInf.GetLast()->GetJoinBorderWithNext() )
{
- rPortion.SetJoinBorderWithPrev(true);
- if( rPortion.InTxtGrp() && rPortion.Width() > aCurFont.GetLeftBorderSpace() )
- rPortion.Width(rPortion.Width() - aCurFont.GetLeftBorderSpace());
+ // In some case border merge is called twice to the portion
+ if( !rPortion.GetJoinBorderWithPrev() )
+ {
+ rPortion.SetJoinBorderWithPrev(true);
+ if( rPortion.InTxtGrp() && rPortion.Width() > aCurFont.GetLeftBorderSpace() )
+ rPortion.Width(rPortion.Width() - aCurFont.GetLeftBorderSpace());
+ }
}
else
{
@@ -2653,18 +2657,22 @@ void SwTxtFormatter::MergeCharacterBorder( SwLinePortion& rPortion, SwTxtFormatI
// Get next portion's font
bool bSeek = false;
- if( !rInf.IsFull() // Last portion of the line (in case of line break)
- && rInf.GetIdx() + rPortion.GetLen() != rInf.GetTxt().getLength() ) // Last portion of the paragraph
+ if( !rInf.IsFull() && // Not the last portion of the line (in case of line break)
+ rInf.GetIdx() + rPortion.GetLen() != rInf.GetTxt().getLength() ) // Not the last portion of the paragraph
bSeek = Seek(rInf.GetIdx() + rPortion.GetLen());
- // If next portion has the same font then merge
+ // If next portion has the same border then merge
if( bSeek && GetFnt()->HasBorder() && ::lcl_HasSameBorder(aCurFont, *GetFnt()) )
{
- rPortion.SetJoinBorderWithNext(true);
- if( rPortion.InTxtGrp() && rPortion.Width() > aCurFont.GetRightBorderSpace() )
- rPortion.Width(rPortion.Width() - aCurFont.GetRightBorderSpace());
+ // In some case border merge is called twice to the portion
+ if( !rPortion.GetJoinBorderWithNext() )
+ {
+ rPortion.SetJoinBorderWithNext(true);
+ if( rPortion.InTxtGrp() && rPortion.Width() > aCurFont.GetRightBorderSpace() )
+ rPortion.Width(rPortion.Width() - aCurFont.GetRightBorderSpace());
+ }
}
- // If this is the last portion of the merge group than make the real height merge
+ // If this is the last portion of the merge group then make the real height merge
else
{
rPortion.SetJoinBorderWithNext(false);
commit 3da52a1f5783ee1fd6fe7f741920b0450305f1b6
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Wed Sep 11 16:48:40 2013 +0200
Remove unused width members from BorderLine class
Change-Id: Ibf86c21ab13a4dce4e43634b26dfe8b3cf9a5b72
diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index fd91e16..66194d6 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -62,9 +62,6 @@ namespace editeng {
long m_nDiv;
SvxBorderStyle m_nStyle;
- sal_uInt16 nOutWidth;
- sal_uInt16 nInWidth;
- sal_uInt16 nDistance;
bool m_bUseLeftTop;
Color (*m_pColorOutFn)( Color );
commit 922e4ba2994c914a8b393723fbee28529abd8a6b
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Wed Sep 11 16:45:41 2013 +0200
Use the shorter GetScaledWidth() method
Change-Id: Id3ad483d3830310b8d13c86e407ff88d9a709464
diff --git a/editeng/source/items/borderline.cxx b/editeng/source/items/borderline.cxx
index 6a61aad..e80685e 100644
--- a/editeng/source/items/borderline.cxx
+++ b/editeng/source/items/borderline.cxx
@@ -661,8 +661,8 @@ OUString SvxBorderLine::GetValueString( SfxMapUnit eSrcUnit,
bool SvxBorderLine::HasPriority( const SvxBorderLine& rOtherLine ) const
{
- const sal_uInt16 nThisSize = GetOutWidth() + GetDistance() + GetInWidth();
- const sal_uInt16 nOtherSize = rOtherLine.GetOutWidth() + rOtherLine.GetDistance() + rOtherLine.GetInWidth();
+ const sal_uInt16 nThisSize = GetScaledWidth();
+ const sal_uInt16 nOtherSize = rOtherLine.GetScaledWidth();
if ( nThisSize > nOtherSize )
{
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index 0c5917d..0d194b1 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -2461,7 +2461,7 @@ sal_uInt16 SvxBoxItem::CalcLineSpace( sal_uInt16 nLine, sal_Bool bIgnoreLine ) c
if( pTmp )
{
- nDist = nDist + (sal_uInt16)(pTmp->GetOutWidth()) + (sal_uInt16)(pTmp->GetInWidth()) + (sal_uInt16)(pTmp->GetDistance());
+ nDist = nDist + pTmp->GetScaledWidth();
}
else if( !bIgnoreLine )
nDist = 0;
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index ce572b9..2ec52ec 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -67,8 +67,8 @@ bool ScHasPriority( const ::editeng::SvxBorderLine* pThis, const ::editeng::SvxB
if (!pOther)
return true;
- sal_uInt16 nThisSize = pThis->GetOutWidth() + pThis->GetDistance() + pThis->GetInWidth();
- sal_uInt16 nOtherSize = pOther->GetOutWidth() + pOther->GetDistance() + pOther->GetInWidth();
+ sal_uInt16 nThisSize = pThis->GetScaledWidth();
+ sal_uInt16 nOtherSize = pOther->GetScaledWidth();
if (nThisSize > nOtherSize)
return true;
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 0a7cb32..388f08d 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -165,7 +165,7 @@ size_t ScPageRowEntry::CountVisible() const
static long lcl_LineTotal(const ::editeng::SvxBorderLine* pLine)
{
- return pLine ? ( pLine->GetOutWidth() + pLine->GetInWidth() + pLine->GetDistance() ) : 0;
+ return pLine ? ( pLine->GetScaledWidth() ) : 0;
}
void ScPrintFunc::Construct( const ScPrintOptions* pOptions )
diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx
index 9ccbdfa..55ed2d2 100644
--- a/svx/source/table/tablelayouter.cxx
+++ b/svx/source/table/tablelayouter.cxx
@@ -901,8 +901,8 @@ bool TableLayouter::HasPriority( const SvxBorderLine* pThis, const SvxBorderLine
if (!pOther || (pOther == &gEmptyBorder))
return true;
- sal_uInt16 nThisSize = pThis->GetOutWidth() + pThis->GetDistance() + pThis->GetInWidth();
- sal_uInt16 nOtherSize = pOther->GetOutWidth() + pOther->GetDistance() + pOther->GetInWidth();
+ sal_uInt16 nThisSize = pThis->GetScaledWidth();
+ sal_uInt16 nOtherSize = pOther->GetScaledWidth();
if (nThisSize > nOtherSize)
return true;
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index 10627af..259d2fe 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -204,8 +204,7 @@ bool sw_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
else
{
if (!bHasWidth)
- nWidth = rpLine->GetInWidth() + rpLine->GetDistance() +
- rpLine->GetOutWidth();
+ nWidth = rpLine->GetScaledWidth();
rpLine->SetWidth( nWidth );
}
commit 1ae3638dbf82239ab3e64cbbc8ab34394a3fa1e2
Author: Zolnai Tamás <zolnaitamas2000 at gmail.com>
Date: Wed Sep 11 14:35:58 2013 +0200
Fix drawing of fine dashed border type
On the Borders tab in the preview block (called User-defined area
in help) fine dashed border is drawn as solid line.
The problem is that 1 pixel gap is too small and painting
can hadnle it so I doubled the numbers to get the same rate and
get the rigth visual result.
Change-Id: Ide037fa3f4f90b304dc53f5f806c2acd2194ec0c
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index cefcc03..8855dcd 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -625,8 +625,8 @@ namespace svtools
case STYLE_FINE_DASHED:
if ( eUnit == MAP_PIXEL )
{
- aPattern.push_back( 4 );
- aPattern.push_back( 1 );
+ aPattern.push_back( 8 );
+ aPattern.push_back( 2 );
}
else if ( eUnit == MAP_TWIP )
{
commit fdd3f483ccafd23603252e133d643141bc17ce65
Author: Minh Ngo <nlminhtl at gmail.com>
Date: Sun Sep 15 19:41:54 2013 +0300
Avmedia/VLC: Zooming 1:2, 2:1, 1:1
Doesn't work nice yet :)
Change-Id: I0fbdaea1cc64a94a9b63975b8b24c8d7e6251f6f
diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx
index cdabc30b..4a454d8 100644
--- a/avmedia/source/vlc/vlcplayer.cxx
+++ b/avmedia/source/vlc/vlcplayer.cxx
@@ -37,6 +37,16 @@ VLCPlayer::VLCPlayer( const rtl::OUString& url,
mPlayer.setMouseHandling( false );
}
+unsigned VLCPlayer::getWidth() const
+{
+ return mPlayer.getWidth();
+}
+
+unsigned VLCPlayer::getHeight() const
+{
+ return mPlayer.getHeight();
+}
+
void SAL_CALL VLCPlayer::start() throw ( ::com::sun::star::uno::RuntimeException )
{
::osl::MutexGuard aGuard(m_aMutex);
@@ -61,6 +71,12 @@ double SAL_CALL VLCPlayer::getDuration() throw ( ::com::sun::star::uno::RuntimeE
return static_cast<double>( mMedia.getDuration() ) / MS_IN_SEC;
}
+void SAL_CALL VLCPlayer::setScale( float factor )
+{
+ ::osl::MutexGuard aGuard(m_aMutex);
+ mPlayer.setScale( factor );
+}
+
void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( ::com::sun::star::uno::RuntimeException )
{
::osl::MutexGuard aGuard(m_aMutex);
diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx
index bb37f8a..cbc009c 100644
--- a/avmedia/source/vlc/vlcplayer.hxx
+++ b/avmedia/source/vlc/vlcplayer.hxx
@@ -57,6 +57,10 @@ public:
wrapper::Instance& instance,
wrapper::EventHandler& eh );
+ unsigned getWidth() const;
+ unsigned getHeight() const;
+
+ void SAL_CALL setScale( float factor );
void SAL_CALL setWindowID( const intptr_t windowID );
void SAL_CALL start() throw ( ::com::sun::star::uno::RuntimeException );
diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx
index aab1ea8..073fc22 100644
--- a/avmedia/source/vlc/vlcwindow.cxx
+++ b/avmedia/source/vlc/vlcwindow.cxx
@@ -41,6 +41,21 @@ void SAL_CALL VLCWindow::update() throw (css::uno::RuntimeException)
meZoomLevel = eZoomLevel;
}
+ switch ( static_cast<int>( eZoomLevel ) )
+ {
+ case media::ZoomLevel_ORIGINAL:
+ mPlayer.setScale( 1.0 );
+ break;
+ case media::ZoomLevel_FIT_TO_WINDOW:
+ break;
+ case media::ZoomLevel_ZOOM_1_TO_2:
+ mPlayer.setScale( 0.5 );
+ break;
+ case media::ZoomLevel_ZOOM_2_TO_1:
+ mPlayer.setScale( 2.0 );
+ break;
+ }
+
bRet = true;
}
@@ -87,7 +102,7 @@ void SAL_CALL VLCWindow::removeEventListener( const uno::Reference< lang::XEvent
{
}
-void SAL_CALL VLCWindow::setPosSize( sal_Int32, sal_Int32, sal_Int32, sal_Int32, sal_Int16 )
+void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags )
throw (uno::RuntimeException)
{
}
@@ -98,8 +113,8 @@ awt::Rectangle SAL_CALL VLCWindow::getPosSize()
awt::Rectangle aRet;
aRet.X = aRet.Y = 0;
- aRet.Width = 320;
- aRet.Height = 240;
+ aRet.Width = mPlayer.getWidth();
+ aRet.Height = mPlayer.getHeight();
return aRet;
}
diff --git a/avmedia/source/vlc/wrapper/Player.cxx b/avmedia/source/vlc/wrapper/Player.cxx
index e5d4f64..0b56e92 100644
--- a/avmedia/source/vlc/wrapper/Player.cxx
+++ b/avmedia/source/vlc/wrapper/Player.cxx
@@ -46,7 +46,10 @@ namespace
#error unknown OS
#endif
unsigned ( *libvlc_media_player_has_vout ) ( libvlc_media_player_t *p_mi );
- void ( *libvlc_video_set_mouse_input ) ( libvlc_media_player_t *p_mi, unsigned on);
+ void ( *libvlc_video_set_mouse_input ) ( libvlc_media_player_t *p_mi, unsigned on );
+ void ( *libvlc_video_set_scale ) ( libvlc_media_player_t *p_mi, float f_factor );
+ int ( *libvlc_video_get_size ) ( libvlc_media_player_t *p_mi, unsigned num,
+ unsigned *px, unsigned *py );
}
namespace avmedia
@@ -82,7 +85,9 @@ namespace wrapper
#endif
SYM_MAP( libvlc_media_player_has_vout ),
SYM_MAP( libvlc_video_set_mouse_input ),
- SYM_MAP( libvlc_media_player_retain )
+ SYM_MAP( libvlc_media_player_retain ),
+ SYM_MAP( libvlc_video_set_scale ),
+ SYM_MAP( libvlc_video_get_size )
};
return InitApiMap( VLC_PLAYER_API );
@@ -138,6 +143,25 @@ namespace wrapper
return ( time == -1 ? 0 : time );
}
+ void Player::setScale( float factor )
+ {
+ libvlc_video_set_scale( mPlayer, factor );
+ }
+
+ unsigned Player::getWidth() const
+ {
+ unsigned width, height;
+ libvlc_video_get_size( mPlayer, 0, &width, &height );
+ return width;
+ }
+
+ unsigned Player::getHeight() const
+ {
+ unsigned width, height;
+ libvlc_video_get_size( mPlayer, 0, &width, &height );
+ return height;
+ }
+
void Player::setMouseHandling(bool flag)
{
libvlc_video_set_mouse_input( mPlayer, flag );
diff --git a/avmedia/source/vlc/wrapper/Player.hxx b/avmedia/source/vlc/wrapper/Player.hxx
index fa387cb..7aa8147 100644
--- a/avmedia/source/vlc/wrapper/Player.hxx
+++ b/avmedia/source/vlc/wrapper/Player.hxx
@@ -57,6 +57,11 @@ namespace wrapper
bool hasVout() const;
+ void setScale( float factor );
+
+ unsigned getWidth() const;
+ unsigned getHeight() const;
+
inline operator libvlc_media_player_t*()
{
return mPlayer;
commit e62092da17170faa93b61a3a2d7a7ce4b29cc1fc
Author: Minh Ngo <nlminhtl at gmail.com>
Date: Sun Sep 15 19:40:15 2013 +0300
Avmedia/VLC: Error handling & Fixing a bug with a zero duration.
Change-Id: I45baeca91b9f5fc725164490b5880c9040acd679
diff --git a/avmedia/source/vlc/wrapper/Common.cxx b/avmedia/source/vlc/wrapper/Common.cxx
index a851038..1ed5256 100644
--- a/avmedia/source/vlc/wrapper/Common.cxx
+++ b/avmedia/source/vlc/wrapper/Common.cxx
@@ -12,6 +12,7 @@
namespace
{
const char* ( *libvlc_get_version ) (void);
+ char * ( * libvlc_errmsg ) (void);
}
namespace avmedia
@@ -24,7 +25,8 @@ bool Common::LoadSymbols()
{
ApiMap VLC_COMMON_API[] =
{
- SYM_MAP( libvlc_get_version )
+ SYM_MAP( libvlc_get_version ),
+ SYM_MAP( libvlc_errmsg )
};
return InitApiMap( VLC_COMMON_API );
@@ -34,6 +36,11 @@ const char* Common::Version()
{
return libvlc_get_version();
}
+
+const char* Common::LastErrorMessage()
+{
+ return libvlc_errmsg();
+}
}
}
}
\ No newline at end of file
diff --git a/avmedia/source/vlc/wrapper/Common.hxx b/avmedia/source/vlc/wrapper/Common.hxx
index edfb338..9cdffcc 100644
--- a/avmedia/source/vlc/wrapper/Common.hxx
+++ b/avmedia/source/vlc/wrapper/Common.hxx
@@ -21,6 +21,7 @@ namespace wrapper
public:
static bool LoadSymbols();
static const char* Version();
+ static const char* LastErrorMessage();
};
}
}
diff --git a/avmedia/source/vlc/wrapper/Media.cxx b/avmedia/source/vlc/wrapper/Media.cxx
index d0538df..c2627de 100644
--- a/avmedia/source/vlc/wrapper/Media.cxx
+++ b/avmedia/source/vlc/wrapper/Media.cxx
@@ -12,6 +12,7 @@
#include "SymbolLoader.hxx"
#include "Instance.hxx"
#include "Types.hxx"
+#include "Common.hxx"
struct libvlc_instance_t;
@@ -27,6 +28,8 @@ namespace
void ( *libvlc_media_release ) ( libvlc_media_t *p_md );
void ( *libvlc_media_retain ) ( libvlc_media_t *p_md );
libvlc_time_t ( *libvlc_media_get_duration ) ( libvlc_media_t *p_md );
+ void ( *libvlc_media_parse ) ( libvlc_media_t *p_md );
+ int ( *libvlc_media_is_parsed ) ( libvlc_media_t *p_md );
libvlc_media_t* InitMedia( const rtl::OUString& url, Instance& instance )
{
@@ -44,7 +47,9 @@ bool Media::LoadSymbols()
SYM_MAP( libvlc_media_new_path ),
SYM_MAP( libvlc_media_release ),
SYM_MAP( libvlc_media_retain ),
- SYM_MAP( libvlc_media_get_duration )
+ SYM_MAP( libvlc_media_get_duration ),
+ SYM_MAP( libvlc_media_parse ),
+ SYM_MAP( libvlc_media_is_parsed )
};
return InitApiMap( VLC_MEDIA_API );
@@ -71,9 +76,20 @@ const Media& Media::operator=( const Media& other )
int Media::getDuration() const
{
+ if ( !libvlc_media_is_parsed( mMedia ) )
+ libvlc_media_parse( mMedia );
+
const int duration = libvlc_media_get_duration( mMedia );
if (duration == -1)
+ {
+ SAL_WARN("avmedia", Common::LastErrorMessage());
return 0;
+ }
+ else if (duration == 0)
+ {
+ // A duration must be greater than 0
+ return 1;
+ }
return duration;
}
commit fcc436bc62cfd8d14efe12391f5f58e7e1d7e594
Author: Tomaž Vajngerl <quikee at gmail.com>
Date: Sun Sep 15 16:19:04 2013 +0200
use rtl::math::round for rounding, std:round is C++11
Change-Id: Ibba1a3e712de56844be454a87a0bb65c26ae4fe1
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 6d9adee..a41d0e0 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -19,7 +19,6 @@
#include <cstring>
#include <climits>
-#include <cmath>
#include <tools/shl.hxx>
#include <vcl/image.hxx>
@@ -366,7 +365,7 @@ long SvxRuler::MakePositionSticky(long aPosition, long aPointOfReference, bool a
// Convert position to current selected map mode
long aPositionLogic = pEditWin->PixelToLogic(Size(aTranslatedPosition, 0), GetCurrentMapMode()).Width();
// Normalize -- snap to nearest tick
- aPositionLogic = std::round((aPositionLogic + aHalfTick) / aTick) * aTick;
+ aPositionLogic = rtl::math::round((aPositionLogic + aHalfTick) / aTick) * aTick;
// Convert back to pixels
aPosition = pEditWin->LogicToPixel(Size(aPositionLogic, 0), GetCurrentMapMode()).Width();
// Move "coordinate system" back to original position
@@ -2080,7 +2079,7 @@ long SvxRuler::RoundToCurrentMapMode(long lValue) const
double aRoundingFactor = aUnitData.nTickUnit / aUnitData.nTick1;
long lNewValue = pEditWin->LogicToLogic(Size(lValue, 0), pEditWin->GetMapMode(), GetCurrentMapMode()).Width();
- lNewValue = (std::round(lNewValue / (double) aUnitData.nTickUnit * aRoundingFactor) / aRoundingFactor) * aUnitData.nTickUnit;
+ lNewValue = (rtl::math::round(lNewValue / (double) aUnitData.nTickUnit * aRoundingFactor) / aRoundingFactor) * aUnitData.nTickUnit;
return pEditWin->LogicToLogic(Size(lNewValue, 0), GetCurrentMapMode(), pEditWin->GetMapMode()).Width();
}
commit b0c3f45becac49ae05bff2b694c3ffe906439979
Author: Tomaž Vajngerl <quikee at gmail.com>
Date: Sun Sep 15 16:10:39 2013 +0200
include cmath
Change-Id: I34fd87a7599884340adbf6e3ae7df321cfc85e23
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 1d41531..6d9adee 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -19,6 +19,7 @@
#include <cstring>
#include <climits>
+#include <cmath>
#include <tools/shl.hxx>
#include <vcl/image.hxx>
commit 2acfc0a94c95ae579aca6f057949f59bd7c123b9
Author: Tomaž Vajngerl <quikee at gmail.com>
Date: Sun Sep 15 16:09:24 2013 +0200
cleanup ruler items (rulritem.hxx) - remove comments, identation
Change-Id: I450ebe3ceab0acf03221970b33c8da4cbb2c6a52
diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx
index b2c6195..cd19467 100644
--- a/include/svx/rulritem.hxx
+++ b/include/svx/rulritem.hxx
@@ -21,7 +21,7 @@
#include <tools/gen.hxx>
#include <svl/poolitem.hxx>
-#include "svx/svxdllapi.h"
+#include <svx/svxdllapi.h>
#include <vector>
class SVX_DLLPUBLIC SvxLongLRSpaceItem : public SfxPoolItem
@@ -52,10 +52,10 @@ public:
SvxLongLRSpaceItem(const SvxLongLRSpaceItem &);
SvxLongLRSpaceItem();
- long GetLeft() const { return lLeft; }
- long GetRight() const { return lRight; }
- void SetLeft(long lArgLeft) {lLeft=lArgLeft;}
- void SetRight(long lArgRight) {lRight=lArgRight;}
+ long GetLeft() const;
+ long GetRight() const;
+ void SetLeft(long lArgLeft);
+ void SetRight(long lArgRight);
};
class SVX_DLLPUBLIC SvxLongULSpaceItem : public SfxPoolItem
@@ -86,10 +86,10 @@ public:
SvxLongULSpaceItem(const SvxLongULSpaceItem &);
SvxLongULSpaceItem();
- long GetUpper() const { return lLeft; }
- long GetLower() const { return lRight; }
- void SetUpper(long lArgLeft) {lLeft=lArgLeft;}
- void SetLower(long lArgRight) {lRight=lArgRight;}
+ long GetUpper() const;
+ long GetLower() const;
+ void SetUpper(long lArgLeft);
+ void SetLower(long lArgRight);
};
class SVX_DLLPUBLIC SvxPagePosSizeItem : public SfxPoolItem
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index efcf92e..3a17b58 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -23,15 +23,13 @@
#include <com/sun/star/frame/status/LeftRightMargin.hpp>
#include <com/sun/star/frame/status/UpperLowerMargin.hpp>
-//------------------------------------------------------------------------
-
TYPEINIT1_AUTOFACTORY(SvxPagePosSizeItem, SfxPoolItem);
TYPEINIT1_AUTOFACTORY(SvxLongLRSpaceItem, SfxPoolItem);
TYPEINIT1_AUTOFACTORY(SvxLongULSpaceItem, SfxPoolItem);
TYPEINIT1(SvxColumnItem, SfxPoolItem);
TYPEINIT1(SvxObjectItem, SfxPoolItem);
-//------------------------------------------------------------------------
+/* SvxLongLRSpaceItem */
int SvxLongLRSpaceItem::operator==( const SfxPoolItem& rCmp) const
{
@@ -40,9 +38,6 @@ int SvxLongLRSpaceItem::operator==( const SfxPoolItem& rCmp) const
lRight==((const SvxLongLRSpaceItem &)rCmp).lRight;
}
-
-//------------------------------------------------------------------------
-
OUString SvxLongLRSpaceItem::GetValueText() const
{
return OUString();
@@ -80,7 +75,6 @@ bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8
return true;
}
-// -----------------------------------------------------------------------
bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -92,8 +86,8 @@ bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u
::com::sun::star::frame::status::LeftRightMargin aLeftRightMargin;
if ( rVal >>= aLeftRightMargin )
{
- lLeft = bConvert ? MM100_TO_TWIP( aLeftRightMargin.Left ) : aLeftRightMargin.Left;
- lRight = bConvert ? MM100_TO_TWIP( aLeftRightMargin.Right ) : aLeftRightMargin.Right;
+ lLeft = bConvert ? MM100_TO_TWIP(aLeftRightMargin.Left) : aLeftRightMargin.Left;
+ lRight = bConvert ? MM100_TO_TWIP(aLeftRightMargin.Right) : aLeftRightMargin.Right;
return true;
}
}
@@ -115,63 +109,69 @@ bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u
return false;
}
-//------------------------------------------------------------------------
-
-SfxItemPresentation SvxLongLRSpaceItem::GetPresentation
-(
- SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
- OUString& /*rText*/, const IntlWrapper *
-) const
+SfxItemPresentation SvxLongLRSpaceItem::GetPresentation(
+ SfxItemPresentation /*ePres*/,
+ SfxMapUnit /*eCoreUnit*/,
+ SfxMapUnit /*ePresUnit*/,
+ OUString& /*rText*/,
+ const IntlWrapper* /*pWrapper*/) const
{
-
return SFX_ITEM_PRESENTATION_NONE;
}
-//------------------------------------------------------------------------
-
SfxPoolItem* SvxLongLRSpaceItem::Clone(SfxItemPool *) const
{
return new SvxLongLRSpaceItem(*this);
}
-//------------------------------------------------------------------------
-
-SvxLongLRSpaceItem::SvxLongLRSpaceItem(long lL, long lR, sal_uInt16 nId)
- : SfxPoolItem(nId),
- lLeft(lL),
- lRight(lR)
+SvxLongLRSpaceItem::SvxLongLRSpaceItem(long lL, long lR, sal_uInt16 nId) :
+ SfxPoolItem (nId),
+ lLeft (lL),
+ lRight (lR)
{}
-//------------------------------------------------------------------------
-
SvxLongLRSpaceItem::SvxLongLRSpaceItem() :
- SfxPoolItem( 0 ),
- lLeft( 0 ),
- lRight( 0 )
+ SfxPoolItem (0),
+ lLeft (0),
+ lRight (0)
+{}
+
+SvxLongLRSpaceItem::SvxLongLRSpaceItem(const SvxLongLRSpaceItem &rCpy) :
+ SfxPoolItem (rCpy),
+ lLeft (rCpy.lLeft),
+ lRight (rCpy.lRight)
{}
-//------------------------------------------------------------------------
+long SvxLongLRSpaceItem::GetLeft() const
+{
+ return lLeft;
+}
+
+long SvxLongLRSpaceItem::GetRight() const
+{
+ return lRight;
+}
+
+void SvxLongLRSpaceItem::SetLeft(long lArgLeft)
+{
+ lLeft = lArgLeft;
+}
-SvxLongLRSpaceItem::SvxLongLRSpaceItem(const SvxLongLRSpaceItem &rCpy)
- : SfxPoolItem(rCpy),
- lLeft(rCpy.lLeft),
- lRight(rCpy.lRight)
- {}
+void SvxLongLRSpaceItem::SetRight(long lArgRight)
+{
+ lRight = lArgRight;
+}
-//------------------------------------------------------------------------
+/* SvxLongULSpaceItem */
int SvxLongULSpaceItem::operator==( const SfxPoolItem& rCmp) const
{
return SfxPoolItem::operator==(rCmp) &&
- lLeft==((const SvxLongULSpaceItem &)rCmp).lLeft &&
- lRight==((const SvxLongULSpaceItem &)rCmp).lRight;
+ lLeft == ((const SvxLongULSpaceItem&)rCmp).lLeft &&
+ lRight == ((const SvxLongULSpaceItem&)rCmp).lRight;
}
-//------------------------------------------------------------------------
-
OUString SvxLongULSpaceItem::GetValueText() const
{
return OUString();
@@ -206,7 +206,6 @@ bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8
return true;
}
-// -----------------------------------------------------------------------
bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
@@ -241,51 +240,60 @@ bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u
return false;
}
-//------------------------------------------------------------------------
-
-SfxItemPresentation SvxLongULSpaceItem::GetPresentation
-(
- SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
- OUString& /*rText*/, const IntlWrapper *
-) const
+SfxItemPresentation SvxLongULSpaceItem::GetPresentation(
+ SfxItemPresentation /*ePres*/,
+ SfxMapUnit /*eCoreUnit*/,
+ SfxMapUnit /*ePresUnit*/,
+ OUString& /*rText*/,
+ const IntlWrapper* /*pWrapper*/ ) const
{
return SFX_ITEM_PRESENTATION_NONE;
}
-//------------------------------------------------------------------------
-
SfxPoolItem* SvxLongULSpaceItem::Clone(SfxItemPool *) const
{
return new SvxLongULSpaceItem(*this);
}
-//------------------------------------------------------------------------
+SvxLongULSpaceItem::SvxLongULSpaceItem(long lL, long lR, sal_uInt16 nId) :
+ SfxPoolItem (nId),
+ lLeft (lL),
+ lRight (lR)
+{}
-SvxLongULSpaceItem::SvxLongULSpaceItem(long lL, long lR, sal_uInt16 nId)
- : SfxPoolItem(nId),
- lLeft(lL),
- lRight(lR)
+SvxLongULSpaceItem::SvxLongULSpaceItem(const SvxLongULSpaceItem &rCpy) :
+ SfxPoolItem (rCpy),
+ lLeft (rCpy.lLeft),
+ lRight (rCpy.lRight)
{}
-//------------------------------------------------------------------------
+SvxLongULSpaceItem::SvxLongULSpaceItem() :
+ SfxPoolItem (0),
+ lLeft (0),
+ lRight (0)
+{}
+
+long SvxLongULSpaceItem::GetUpper() const
+{
+ return lLeft;
+}
-SvxLongULSpaceItem::SvxLongULSpaceItem(const SvxLongULSpaceItem &rCpy)
- : SfxPoolItem(rCpy),
- lLeft(rCpy.lLeft),
- lRight(rCpy.lRight)
- {}
+long SvxLongULSpaceItem::GetLower() const
+{
+ return lRight;
+}
-//------------------------------------------------------------------------
+void SvxLongULSpaceItem::SetUpper(long lArgLeft)
+{
+ lLeft = lArgLeft;
+}
-SvxLongULSpaceItem::SvxLongULSpaceItem() :
- SfxPoolItem( 0 ),
- lLeft( 0 ),
- lRight( 0 )
-{}
+void SvxLongULSpaceItem::SetLower(long lArgRight)
+{
+ lRight = lArgRight;
+}
-//------------------------------------------------------------------------
+/* SvxPagePosSizeItem */
int SvxPagePosSizeItem::operator==( const SfxPoolItem& rCmp) const
{
@@ -362,61 +370,48 @@ bool SvxPagePosSizeItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_u
return false;
}
-//------------------------------------------------------------------------
-
OUString SvxPagePosSizeItem::GetValueText() const
{
return OUString();
}
-//------------------------------------------------------------------------
-
-SfxItemPresentation SvxPagePosSizeItem::GetPresentation
-(
- SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
- OUString& /*rText*/, const IntlWrapper *
-) const
+SfxItemPresentation SvxPagePosSizeItem::GetPresentation(
+ SfxItemPresentation /*ePres*/,
+ SfxMapUnit /*eCoreUnit*/,
+ SfxMapUnit /*ePresUnit*/,
+ OUString& /*rText*/,
+ const IntlWrapper* /*pWrapper*/ ) const
{
return SFX_ITEM_PRESENTATION_NONE;
}
-//------------------------------------------------------------------------
-
SfxPoolItem* SvxPagePosSizeItem::Clone(SfxItemPool *) const
{
return new SvxPagePosSizeItem(*this);
}
-//------------------------------------------------------------------------
-
-SvxPagePosSizeItem::SvxPagePosSizeItem(const Point &rP, long lW, long lH)
- : SfxPoolItem(SID_RULER_PAGE_POS),
- aPos(rP),
- lWidth(lW),
- lHeight(lH)
+SvxPagePosSizeItem::SvxPagePosSizeItem(const Point &rP, long lW, long lH) :
+ SfxPoolItem (SID_RULER_PAGE_POS),
+ aPos (rP),
+ lWidth (lW),
+ lHeight (lH)
{}
-//------------------------------------------------------------------------
-
-SvxPagePosSizeItem::SvxPagePosSizeItem(const SvxPagePosSizeItem &rCpy)
- : SfxPoolItem(rCpy),
- aPos(rCpy.aPos),
- lWidth(rCpy.lWidth),
- lHeight(rCpy.lHeight)
- {}
-
-//------------------------------------------------------------------------
+SvxPagePosSizeItem::SvxPagePosSizeItem(const SvxPagePosSizeItem &rCpy) :
+ SfxPoolItem (rCpy),
+ aPos (rCpy.aPos),
+ lWidth (rCpy.lWidth),
+ lHeight (rCpy.lHeight)
+{}
-SvxPagePosSizeItem::SvxPagePosSizeItem()
- : SfxPoolItem( 0 ),
- aPos( 0, 0 ),
- lWidth( 0 ),
- lHeight( 0 )
+SvxPagePosSizeItem::SvxPagePosSizeItem() :
+ SfxPoolItem (0),
+ aPos (0, 0),
+ lWidth (0),
+ lHeight (0)
{}
-//------------------------------------------------------------------------
+/* SvxColumnItem */
int SvxColumnItem::operator==(const SfxPoolItem& rCmp) const
{
@@ -429,15 +424,14 @@ int SvxColumnItem::operator==(const SfxPoolItem& rCmp) const
return sal_False;
const sal_uInt16 nCount = ((const SvxColumnItem&)rCmp).Count();
- for(sal_uInt16 i = 0; i < nCount;++i) {
+ for(sal_uInt16 i = 0; i < nCount;++i)
+ {
if( (*this)[i] != ((const SvxColumnItem&)rCmp)[i] )
return sal_False;
}
return sal_True;
}
-//------------------------------------------------------------------------
-
SvxColumnItem::SvxColumnItem( sal_uInt16 nAct ) :
SfxPoolItem (SID_RULER_BORDERS),
nLeft (0),
@@ -446,8 +440,7 @@ SvxColumnItem::SvxColumnItem( sal_uInt16 nAct ) :
bTable (sal_False),
bOrtho (sal_True)
-{
-}
+{}
SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, sal_uInt16 left, sal_uInt16 right ) :
SfxPoolItem (SID_RULER_BORDERS),
@@ -456,8 +449,7 @@ SvxColumnItem::SvxColumnItem( sal_uInt16 nActCol, sal_uInt16 left, sal_uInt16 ri
nActColumn (nActCol),
bTable (sal_True),
bOrtho (sal_True)
-{
-}
+{}
SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) :
SfxPoolItem (rCopy),
@@ -472,8 +464,7 @@ SvxColumnItem::SvxColumnItem( const SvxColumnItem& rCopy ) :
}
SvxColumnItem::~SvxColumnItem()
-{
-}
+{}
OUString SvxColumnItem::GetValueText() const
{
@@ -481,11 +472,11 @@ OUString SvxColumnItem::GetValueText() const
}
SfxItemPresentation SvxColumnItem::GetPresentation(
- SfxItemPresentation /*ePres*/,
- SfxMapUnit /*eCoreUnit*/,
- SfxMapUnit /*ePresUnit*/,
- OUString& /*rText*/,
- const IntlWrapper*) const
+ SfxItemPresentation /*ePres*/,
+ SfxMapUnit /*eCoreUnit*/,
+ SfxMapUnit /*ePresUnit*/,
+ OUString& /*rText*/,
+ const IntlWrapper* /*pWrapper*/ ) const
{
return SFX_ITEM_PRESENTATION_NONE;
}
@@ -595,6 +586,8 @@ sal_uInt16 SvxColumnItem::Count() const
return aColumns.size();
}
+/* SvxColumnDescription */
+
SvxColumnDescription& SvxColumnItem::At(sal_uInt16 index)
{
return aColumns[index];
@@ -690,8 +683,6 @@ sal_Bool SvxColumnItem::IsConsistent() const
return nActColumn < aColumns.size();
}
-//------------------------------------------------------------------------
-
int SvxObjectItem::operator==( const SfxPoolItem& rCmp ) const
{
return SfxPoolItem::operator==(rCmp) &&
@@ -702,15 +693,11 @@ int SvxObjectItem::operator==( const SfxPoolItem& rCmp ) const
bLimits == ((const SvxObjectItem&)rCmp).bLimits;
}
-//------------------------------------------------------------------------
-
OUString SvxObjectItem::GetValueText() const
{
return OUString();
}
-//------------------------------------------------------------------------
-
SfxItemPresentation SvxObjectItem::GetPresentation
(
SfxItemPresentation /*ePres*/,
@@ -722,15 +709,11 @@ SfxItemPresentation SvxObjectItem::GetPresentation
return SFX_ITEM_PRESENTATION_NONE;
}
-//------------------------------------------------------------------------
-
SfxPoolItem* SvxObjectItem::Clone(SfxItemPool *) const
{
return new SvxObjectItem(*this);
}
-//------------------------------------------------------------------------
-
SvxObjectItem::SvxObjectItem( long nSX, long nEX,
long nSY, long nEY, sal_Bool limits ) :
@@ -745,8 +728,6 @@ SvxObjectItem::SvxObjectItem( long nSX, long nEX,
{
}
-//------------------------------------------------------------------------
-
SvxObjectItem::SvxObjectItem( const SvxObjectItem& rCopy ) :
SfxPoolItem( rCopy ),
commit 4bc0d4ebe09756b044dc81a9adce1cb95ad9c3f8
Author: Tomaž Vajngerl <quikee at gmail.com>
Date: Sun Sep 15 15:48:16 2013 +0200
remove CalcOrtho "redeclaration"
Change-Id: I3a0d74e0232fedc8a3beabebadca45fa8ad841fb
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index a49044c..efcf92e 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -675,8 +675,6 @@ sal_Bool SvxColumnItem::IsTable() const
return bTable;
}
-sal_Bool SvxColumnItem::CalcOrtho() const;
-
void SvxColumnItem::SetOrtho(sal_Bool bVal)
{
bOrtho = bVal;
commit 13aedd1d0ec1ef4c5687c207eb1d9c986c1299d9
Author: Tomaž Vajngerl <quikee at gmail.com>
Date: Sat Sep 14 13:52:58 2013 +0200
Save should encrypt OOXML document if it was loaded encrypted.
Currently Agile encryption is not supported, so all documents
loaded with "agile" encryption will be encrypted with "standard"
encryption when they are saved afterwards.
Change-Id: Id0477f43c00ed70032ca6b3390eebb1105d5ffa7
diff --git a/include/oox/crypto/DocumentDecryption.hxx b/include/oox/crypto/DocumentDecryption.hxx
index 768cdbf..1502c41 100644
--- a/include/oox/crypto/DocumentDecryption.hxx
+++ b/include/oox/crypto/DocumentDecryption.hxx
@@ -59,7 +59,7 @@ public:
bool readEncryptionInfo();
bool generateEncryptionKey(const OUString& rPassword);
- com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > createEncryptionData();
+ com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue > createEncryptionData(const OUString& rPassword);
static bool checkEncryptionData( const com::sun::star::uno::Sequence< com::sun::star::beans::NamedValue >& rEncryptionData );
};
diff --git a/include/oox/crypto/Standard2007Engine.hxx b/include/oox/crypto/Standard2007Engine.hxx
index c53ec22..563a710 100644
--- a/include/oox/crypto/Standard2007Engine.hxx
+++ b/include/oox/crypto/Standard2007Engine.hxx
@@ -89,11 +89,6 @@ public:
StandardEncryptionInfo& getInfo();
- static bool checkEncryptionData(
- std::vector<sal_uInt8> key, sal_uInt32 keySize,
- std::vector<sal_uInt8> encryptedVerifier, sal_uInt32 verifierSize,
- std::vector<sal_uInt8> encryptedHash, sal_uInt32 hashSize );
-
virtual bool generateEncryptionKey(const OUString& rPassword);
virtual bool writeEncryptionInfo(
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index ff498af..1eee845 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -545,7 +545,8 @@ void FilterBase::setMediaDescriptor( const Sequence< PropertyValue >& rMediaDesc
OUString sFilterName = mxImpl->maMediaDesc.getUnpackedValueOrDefault( "FilterName", OUString() );
try
{
- Reference< XNameAccess > xFilters( Reference<XMultiServiceFactory>(getComponentContext()->getServiceManager(), UNO_QUERY_THROW)->createInstance("com.sun.star.document.FilterFactory" ), UNO_QUERY_THROW );
+ Reference<XMultiServiceFactory> xFactory(getComponentContext()->getServiceManager(), UNO_QUERY_THROW);
+ Reference<XNameAccess> xFilters(xFactory->createInstance("com.sun.star.document.FilterFactory" ), UNO_QUERY_THROW );
Any aValues = xFilters->getByName( sFilterName );
Sequence<PropertyValue > aPropSeq;
aValues >>= aPropSeq;
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 7dd3f92..154cee0 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -286,8 +286,8 @@ PasswordVerifier::PasswordVerifier( DocumentDecryption& aDecryptor ) :
comphelper::DocPasswordVerifierResult PasswordVerifier::verifyPassword( const OUString& rPassword, Sequence<NamedValue>& rEncryptionData )
{
- if( mDecryptor.generateEncryptionKey(rPassword) )
- rEncryptionData = mDecryptor.createEncryptionData();
+ if(mDecryptor.generateEncryptionKey(rPassword))
+ rEncryptionData = mDecryptor.createEncryptionData(rPassword);
return rEncryptionData.hasElements() ? comphelper::DocPasswordVerifierResult_OK : comphelper::DocPasswordVerifierResult_WRONG_PASSWORD;
}
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 763090a..109e9b1 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -657,7 +657,7 @@ Reference<XStream> XmlFilterBase::implGetOutputStream( MediaDescriptor& rMediaDe
OUString aPassword;
for (int i=0; i<aMediaEncData.getLength(); i++)
{
- if (aMediaEncData[i].Name == "Password")
+ if (aMediaEncData[i].Name == "OOXPassword")
{
Any& any = aMediaEncData[i].Value;
any >>= aPassword;
@@ -690,7 +690,7 @@ bool XmlFilterBase::implFinalizeExport( MediaDescriptor& rMediaDescriptor )
for (int i=0; i<aMediaEncData.getLength(); i++)
{
- if (aMediaEncData[i].Name == "Password")
+ if (aMediaEncData[i].Name == "OOXPassword")
{
Any& any = aMediaEncData[i].Value;
any >>= aPassword;
diff --git a/oox/source/crypto/DocumentDecryption.cxx b/oox/source/crypto/DocumentDecryption.cxx
index 1cb6481..0d1c729 100644
--- a/oox/source/crypto/DocumentDecryption.cxx
+++ b/oox/source/crypto/DocumentDecryption.cxx
@@ -202,23 +202,9 @@ DocumentDecryption::DocumentDecryption(oox::ole::OleStorage& rOleStorage, Refere
mCryptoType(UNKNOWN)
{}
-bool DocumentDecryption::checkEncryptionData(const Sequence<NamedValue>& rEncryptionData)
+bool DocumentDecryption::checkEncryptionData(const Sequence<NamedValue>& /*rEncryptionData*/)
{
- SequenceAsHashMap aHashData( rEncryptionData );
- OUString type = aHashData.getUnpackedValueOrDefault( "CryptoType", OUString("Unknown") );
- if (type == "Standard")
- {
- Sequence<sal_Int8> aKeySeq = aHashData.getUnpackedValueOrDefault( "AES128EncryptionKey", Sequence<sal_Int8>() );
- Sequence<sal_Int8> aVerifierSeq = aHashData.getUnpackedValueOrDefault( "AES128EncryptionVerifier", Sequence<sal_Int8>() );
- Sequence<sal_Int8> aHashSeq = aHashData.getUnpackedValueOrDefault( "AES128EncryptionVerifierHash", Sequence<sal_Int8>() );
-
- vector<sal_uInt8> key = convertToVector(aKeySeq);
- vector<sal_uInt8> verifier = convertToVector(aVerifierSeq);
- vector<sal_uInt8> hash = convertToVector(aHashSeq);
-
- return Standard2007Engine::checkEncryptionData( key, key.size(), verifier, verifier.size(), hash, hash.size() );
- }
- return type == "Agile";
+ return false;
}
bool DocumentDecryption::generateEncryptionKey(const OUString& rPassword)
@@ -363,30 +349,21 @@ bool DocumentDecryption::readEncryptionInfo()
return bResult;
}
-Sequence<NamedValue> DocumentDecryption::createEncryptionData()
+Sequence<NamedValue> DocumentDecryption::createEncryptionData(const OUString& rPassword)
{
- Sequence<NamedValue> aResult;
-
- vector<sal_uInt8>& key = mEngine->getKey();
+ SequenceAsHashMap aEncryptionData;
- if (key.size() > 0)
+ if (mCryptoType == AGILE)
{
- SequenceAsHashMap aEncryptionData;
- if (mCryptoType == AGILE)
- {
- aEncryptionData["CryptoType"] <<= OUString("Agile");
- aEncryptionData["AES128EncryptionKey"] <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( &key[0] ), key.size() );
- aResult = aEncryptionData.getAsConstNamedValueList();
- }
- else if (mCryptoType == STANDARD_2007)
- {
- aEncryptionData["CryptoType"] <<= OUString("Standard");
- aEncryptionData["AES128EncryptionKey"] <<= Sequence< sal_Int8 >( reinterpret_cast< const sal_Int8* >( &key[0] ), key.size() );
- aResult = aEncryptionData.getAsConstNamedValueList();
- }
+ aEncryptionData["CryptoType"] <<= OUString("Agile");
+ }
+ else if (mCryptoType == STANDARD_2007)
+ {
+ aEncryptionData["CryptoType"] <<= OUString("Standard");
}
- return aResult;
+ aEncryptionData["OOXPassword"] <<= rPassword;
+ return aEncryptionData.getAsConstNamedValueList();
}
bool DocumentDecryption::decrypt(Reference<XStream> xDocumentStream)
diff --git a/oox/source/crypto/Standard2007Engine.cxx b/oox/source/crypto/Standard2007Engine.cxx
index 3c17bb6..b437846 100644
--- a/oox/source/crypto/Standard2007Engine.cxx
+++ b/oox/source/crypto/Standard2007Engine.cxx
@@ -164,16 +164,22 @@ bool Standard2007Engine::generateEncryptionKey(const OUString& password)
mInfo.verifier.encryptedVerifier + ENCRYPTED_VERIFIER_LENGTH,
encryptedVerifier.begin());
- vector<sal_uInt8> encryptedVerifierHash(ENCRYPTED_VERIFIER_HASH_LENGTH);
+ vector<sal_uInt8> encryptedHash(ENCRYPTED_VERIFIER_HASH_LENGTH);
std::copy(
mInfo.verifier.encryptedVerifierHash,
mInfo.verifier.encryptedVerifierHash + ENCRYPTED_VERIFIER_HASH_LENGTH,
- encryptedVerifierHash.begin());
+ encryptedHash.begin());
- return checkEncryptionData(
- mKey, mKey.size(),
- encryptedVerifier, encryptedVerifier.size(),
- encryptedVerifierHash, encryptedVerifierHash.size() );
+ vector<sal_uInt8> verifier(encryptedVerifier.size(), 0);
+ Decrypt::aes128ecb(verifier, encryptedVerifier, mKey);
+
+ vector<sal_uInt8> verifierHash(encryptedHash.size(), 0);
+ Decrypt::aes128ecb(verifierHash, encryptedHash, mKey);
+
+ vector<sal_uInt8> hash(RTL_DIGEST_LENGTH_SHA1, 0);
+ sha1(hash, verifier);
+
+ return std::equal( hash.begin(), hash.end(), verifierHash.begin() );
}
bool Standard2007Engine::decrypt(
@@ -199,27 +205,6 @@ bool Standard2007Engine::decrypt(
return true;
}
-bool Standard2007Engine::checkEncryptionData(
- vector<sal_uInt8> key, sal_uInt32 keySize,
- vector<sal_uInt8> encryptedVerifier, sal_uInt32 verifierSize,
- vector<sal_uInt8> encryptedHash, sal_uInt32 hashSize )
-{
- // the only currently supported algorithm needs key size 128
- if ( keySize != 16 || verifierSize != 16 )
- return false;
-
- vector<sal_uInt8> verifier(verifierSize, 0);
- Decrypt::aes128ecb(verifier, encryptedVerifier, key);
-
- vector<sal_uInt8> verifierHash(hashSize, 0);
- Decrypt::aes128ecb(verifierHash, encryptedHash, key);
-
- vector<sal_uInt8> hash(RTL_DIGEST_LENGTH_SHA1, 0);
- sha1(hash, verifier);
-
- return std::equal( hash.begin(), hash.end(), verifierHash.begin() );
-}
-
bool Standard2007Engine::writeEncryptionInfo(const OUString& password, BinaryXOutputStream& rStream)
{
mInfo.header.flags = ENCRYPTINFO_AES | ENCRYPTINFO_CRYPTOAPI;
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 77e2a14..81bf474 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -2625,7 +2625,7 @@ ErrCode RequestPassword(const SfxFilter* pCurrentFilter, OUString& aURL, SfxItem
if ( lclSupportsOOXMLEncryption( pCurrentFilter->GetFilterName() ) )
{
::comphelper::SequenceAsHashMap aHashData;
- aHashData[ OUString( "Password" ) ] <<= pPasswordRequest->getPassword();
+ aHashData[ OUString( "OOXPassword" ) ] <<= pPasswordRequest->getPassword();
pSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aHashData.getAsConstNamedValueList() ) ) );
}
else
commit e0a43dff646515bbbcd2099b6fc095a7a89b84f9
Author: Tomaž Vajngerl <quikee at gmail.com>
Date: Fri Sep 13 22:12:51 2013 +0200
Use vector instead of scoped_array to hold ruler items
Change-Id: I51f8d1d22da5f869e9937813de9649fddae1ffda
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index 2541057..ee6ef7f 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -140,6 +140,11 @@ public:
const SvxTabStop& operator[]( const sal_uInt16 nPos ) const
{ return maTabStops[nPos]; }
+ const SvxTabStop& At( const sal_uInt16 nPos ) const
+ {
+ return maTabStops[nPos];
+ }
+
// "pure virtual Methods" from SfxPoolItem
virtual int operator==( const SfxPoolItem& ) const;
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const;
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index 55dea87..09d59f0 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -87,11 +87,11 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
sal_uInt16 nTabBufSize;
long lDefTabDist;
long lTabPos;
- boost::scoped_array<RulerTab> mpTabs; // tab positions in pixel
- boost::scoped_array<RulerIndent> mpIndents; // paragraph margins in pixel
- boost::scoped_array<RulerBorder> mpBorders;
- sal_uInt16 nBorderCount;
- boost::scoped_array<RulerBorder> mpObjectBorders;
+
+ std::vector<RulerTab> mpTabs; // tab positions in pixel
+ std::vector<RulerIndent> mpIndents; // paragraph margins in pixel
+ std::vector<RulerBorder> mpBorders;
+ std::vector<RulerBorder> mpObjectBorders;
SfxBindings* pBindings;
long nDragOffset;
@@ -167,7 +167,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
long GetRightIndent() const;
long GetLogicRightIndent() const;
- inline long GetLeftFrameMargin() const;
+ long GetLeftFrameMargin() const;
long GetRightFrameMargin() const;
void CalcMinMax();
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 2542ac5..1d41531 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -220,8 +220,7 @@ SvxRuler::SvxRuler(
nTabBufSize(0),
lDefTabDist(50),
lTabPos(-1),
- mpBorders(new RulerBorder[1]), // due to one column tables
- nBorderCount(0),
+ mpBorders(1), // due to one column tables
pBindings(&rBindings),
nDragOffset(0),
nMaxLeft(0),
@@ -272,16 +271,19 @@ SvxRuler::SvxRuler(
else
pCtrlItem[i++] = new SvxRulerItem(SID_ATTR_PARA_LRSPACE_VERTICAL, *this, rBindings);
- mpIndents.reset(new RulerIndent[5 + INDENT_GAP]);
- memset(mpIndents.get(), 0, sizeof(RulerIndent) * (3 + INDENT_GAP));
+ mpIndents.resize(5 + INDENT_GAP);
+
+ for(sal_uInt32 nIn = 0; nIn < mpIndents.size(); nIn++)
+ {
+ mpIndents[nIn].nPos = 0;
+ mpIndents[nIn].nStyle = RULER_STYLE_DONTKNOW;
+ }
+
mpIndents[0].nStyle = RULER_STYLE_DONTKNOW;
mpIndents[1].nStyle = RULER_STYLE_DONTKNOW;
mpIndents[INDENT_FIRST_LINE].nStyle = RULER_INDENT_TOP;
mpIndents[INDENT_LEFT_MARGIN].nStyle = RULER_INDENT_BOTTOM;
mpIndents[INDENT_RIGHT_MARGIN].nStyle = RULER_INDENT_BOTTOM;
-
- for(sal_uInt16 nIn = 0; nIn < 7; nIn++)
- mpIndents[nIn].nPos = 0;
}
if( (nFlags & SVXRULER_SUPPORT_BORDERS) == SVXRULER_SUPPORT_BORDERS )
@@ -295,9 +297,7 @@ SvxRuler::SvxRuler(
if( (nFlags & SVXRULER_SUPPORT_OBJECT) == SVXRULER_SUPPORT_OBJECT )
{
pCtrlItem[i++] = new SvxRulerItem(SID_RULER_OBJECT, *this, rBindings );
- mpObjectBorders.reset(new RulerBorder[OBJECT_BORDER_COUNT]);
- size_t nSize = sizeof( RulerBorder ) * OBJECT_BORDER_COUNT;
- memset(mpObjectBorders.get(), 0, nSize);
+ mpObjectBorders.resize(OBJECT_BORDER_COUNT);
for(sal_uInt16 nBorder = 0; nBorder < OBJECT_BORDER_COUNT; ++nBorder)
{
mpObjectBorders[nBorder].nPos = 0;
@@ -759,11 +759,7 @@ void SvxRuler::UpdateColumns()
/* Update column view */
if(mpColumnItem.get() && mpColumnItem->Count() > 1)
{
- if( nBorderCount < mpColumnItem->Count())
- {
- nBorderCount = mpColumnItem->Count();
- mpBorders.reset(new RulerBorder[nBorderCount]);
- }
+ mpBorders.resize(mpColumnItem->Count());
sal_uInt16 nStyleFlags = RULER_BORDER_VARIABLE;
@@ -805,7 +801,7 @@ void SvxRuler::UpdateColumns()
mpBorders[i].nMinPos = ConvertPosPixel(mpColumnItem->At(i).nEndMin + lAppNullOffset);
mpBorders[i].nMaxPos = ConvertPosPixel(mpColumnItem->At(i).nEndMax + lAppNullOffset);
}
- SetBorders(mpColumnItem->Count() - 1, mpBorders.get());
+ SetBorders(mpColumnItem->Count() - 1, &mpBorders[0]);
}
else
{
@@ -818,7 +814,7 @@ void SvxRuler::UpdateObject()
/* Update view of object representation */
if(mpObjectItem.get())
{
- DBG_ASSERT(mpObjectBorders.get(), "no Buffer");
+ DBG_ASSERT(!mpObjectBorders.empty(), "no Buffer");
// !! to the page margin
long nMargin = mpLRSpaceItem.get() ? mpLRSpaceItem->GetLeft() : 0;
mpObjectBorders[0].nPos =
@@ -834,7 +830,7 @@ void SvxRuler::UpdateObject()
ConvertPosPixel(mpObjectItem->GetEndY() - nMargin + lAppNullOffset);
const sal_uInt16 nOffset = GetObjectBordersOff(0);
- SetBorders(2, mpObjectBorders.get() + nOffset);
+ SetBorders(2, &mpObjectBorders[0] + nOffset);
}
else
{
@@ -890,11 +886,11 @@ void SvxRuler::UpdatePara()
else
mpIndents[INDENT_FIRST_LINE].nStyle &= ~RULER_STYLE_INVISIBLE;
- SetIndents(INDENT_COUNT, mpIndents.get() + INDENT_GAP);
+ SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP);
}
else
{
- if(mpIndents.get())
+ if(!mpIndents.empty())
{
mpIndents[INDENT_FIRST_LINE].nPos = 0;
mpIndents[INDENT_LEFT_MARGIN].nPos = 0;
@@ -1054,7 +1050,7 @@ void SvxRuler::UpdateTabs()
const long lParaIndent = nLeftFrameMargin + nParaItemTxtLeft;
const long lLastTab = mpTabStopItem->Count()
- ? ConvertHPosPixel((*mpTabStopItem.get())[mpTabStopItem->Count()-1].GetTabPos())
+ ? ConvertHPosPixel(mpTabStopItem->At(mpTabStopItem->Count() - 1).GetTabPos())
: 0;
const long lPosPixel = ConvertHPosPixel(lParaIndent) + lLastTab;
const long lRightIndent = ConvertHPosPixel(nRightFrameMargin - mpParaItem->GetRight());
@@ -1072,7 +1068,7 @@ void SvxRuler::UpdateTabs()
{
// 10 (GAP) in stock
nTabBufSize = mpTabStopItem->Count() + TAB_GAP + nDefTabBuf + GAP;
- mpTabs.reset(new RulerTab[nTabBufSize]);
+ mpTabs.resize(nTabBufSize);
}
nTabCount = 0;
@@ -1084,17 +1080,21 @@ void SvxRuler::UpdateTabs()
for(j = 0; j < mpTabStopItem->Count(); ++j)
{
- const SvxTabStop* pTab = &(*mpTabStopItem.get())[j];
+ const SvxTabStop* pTab = &mpTabStopItem->At(j);
if (mpRulerImpl->bIsTabsRelativeToIndent)
- mpTabs[nTabCount + TAB_GAP].nPos =
- ConvertHPosPixel( lParaIndent + pTab->GetTabPos() + lAppNullOffset);
+ {
+ long nTabPosition = ConvertHPosPixel(lParaIndent + pTab->GetTabPos() + lAppNullOffset);
+ mpTabs[nTabCount + TAB_GAP].nPos = nTabPosition;
+ }
else
- mpTabs[nTabCount + TAB_GAP].nPos =
- ConvertHPosPixel( 0 + pTab->GetTabPos() + lAppNullOffset);
+ {
+ long nTabPosition = ConvertHPosPixel(0 + pTab->GetTabPos() + lAppNullOffset);
+ mpTabs[nTabCount + TAB_GAP].nPos = nTabPosition;
+ }
if(bRTL)
{
- mpTabs[nTabCount + TAB_GAP].nPos = lParaIndentPix + lRightPixMargin - mpTabs[nTabCount+TAB_GAP].nPos;
+ mpTabs[nTabCount + TAB_GAP].nPos = lParaIndentPix + lRightPixMargin - mpTabs[nTabCount + TAB_GAP].nPos;
}
mpTabs[nTabCount + TAB_GAP].nStyle = ToSvTab_Impl(pTab->GetAdjustment());
++nTabCount;
@@ -1119,7 +1119,7 @@ void SvxRuler::UpdateTabs()
% nDefTabDist );
}
- if(mpTabs[nTabCount+TAB_GAP].nPos <= lParaIndentPix)
+ if(mpTabs[nTabCount + TAB_GAP].nPos <= lParaIndentPix)
break;
mpTabs[nTabCount + TAB_GAP].nStyle = RULER_TAB_DEFAULT;
++nTabCount;
@@ -1135,12 +1135,10 @@ void SvxRuler::UpdateTabs()
//set the first default tab stop
if(mpRulerImpl->bIsTabsRelativeToIndent)
{
- mpTabs[nTabCount + TAB_GAP].nPos =
- (mpTabs[nTabCount].nPos + nDefTabDist);
+ mpTabs[nTabCount + TAB_GAP].nPos = (mpTabs[nTabCount].nPos + nDefTabDist);
mpTabs[nTabCount + TAB_GAP].nPos -=
- ((mpTabs[nTabCount + TAB_GAP].nPos - lParaIndentPix)
- % nDefTabDist );
+ (mpTabs[nTabCount + TAB_GAP].nPos - lParaIndentPix) % nDefTabDist;
aFirst = mpTabs[nTabCount + TAB_GAP].nPos;
}
else
@@ -1165,7 +1163,7 @@ void SvxRuler::UpdateTabs()
++nTabCount;
}
}
- SetTabs(nTabCount, mpTabs.get() + TAB_GAP);
+ SetTabs(nTabCount, &mpTabs[0] + TAB_GAP);
DBG_ASSERT(nTabCount + TAB_GAP <= nTabBufSize, "BufferSize too small");
}
else
@@ -1441,26 +1439,26 @@ void SvxRuler::AdjustMargin1(long lInputDiff)
{
// Right indent of the old position
mpIndents[INDENT_RIGHT_MARGIN].nPos -= lDiff;
- SetIndents(INDENT_COUNT, mpIndents.get() + INDENT_GAP);
+ SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP);
}
if(mpObjectItem.get())
{
mpObjectBorders[GetObjectBordersOff(0)].nPos -= lDiff;
mpObjectBorders[GetObjectBordersOff(1)].nPos -= lDiff;
- SetBorders(2, mpObjectBorders.get() + GetObjectBordersOff(0));
+ SetBorders(2, &mpObjectBorders[0] + GetObjectBordersOff(0));
}
if(mpColumnItem.get())
{
for(sal_uInt16 i = 0; i < mpColumnItem->Count()-1; ++i)
mpBorders[i].nPos -= lDiff;
- SetBorders(mpColumnItem->Count()-1, mpBorders.get());
+ SetBorders(mpColumnItem->Count()-1, &mpBorders[0]);
if(mpColumnItem->IsFirstAct())
{
// Right indent of the old position
if(mpParaItem.get())
{
mpIndents[INDENT_RIGHT_MARGIN].nPos -= lDiff;
- SetIndents(INDENT_COUNT, mpIndents.get() + INDENT_GAP);
+ SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP);
}
}
else
@@ -1470,14 +1468,14 @@ void SvxRuler::AdjustMargin1(long lInputDiff)
mpIndents[INDENT_FIRST_LINE].nPos -= lDiff;
mpIndents[INDENT_LEFT_MARGIN].nPos -= lDiff;
mpIndents[INDENT_RIGHT_MARGIN].nPos -= lDiff;
- SetIndents(INDENT_COUNT, mpIndents.get() + INDENT_GAP);
+ SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP);
}
}
if(mpTabStopItem.get() && (nDragType & DRAG_OBJECT_SIZE_PROPORTIONAL)
&&!IsActFirstColumn())
{
- ModifyTabs_Impl(nTabCount+TAB_GAP, mpTabs.get(), - lDiff);
- SetTabs(nTabCount, mpTabs.get() + TAB_GAP);
+ ModifyTabs_Impl(nTabCount + TAB_GAP, &mpTabs[0], -lDiff);
+ SetTabs(nTabCount, &mpTabs[0] + TAB_GAP);
}
}
}
@@ -1494,14 +1492,14 @@ void SvxRuler::AdjustMargin1(long lInputDiff)
// Left indent of the old position
mpIndents[INDENT_FIRST_LINE].nPos += lDiff;
mpIndents[INDENT_LEFT_MARGIN].nPos += lDiff;
- SetIndents(INDENT_COUNT, mpIndents.get() + INDENT_GAP);
+ SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP);
}
if (mpColumnItem.get())
{
for(sal_uInt16 i = 0; i < mpColumnItem->Count() - 1; ++i)
mpBorders[i].nPos += lDiff;
- SetBorders(mpColumnItem->Count() - 1, mpBorders.get());
+ SetBorders(mpColumnItem->Count() - 1, &mpBorders[0]);
if (mpColumnItem->IsFirstAct())
{
// Left indent of the old position
@@ -1509,7 +1507,7 @@ void SvxRuler::AdjustMargin1(long lInputDiff)
{
mpIndents[INDENT_FIRST_LINE].nPos += lDiff;
mpIndents[INDENT_LEFT_MARGIN].nPos += lDiff;
- SetIndents(INDENT_COUNT, mpIndents.get() + INDENT_GAP);
+ SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP);
}
}
else
@@ -1519,14 +1517,14 @@ void SvxRuler::AdjustMargin1(long lInputDiff)
mpIndents[INDENT_FIRST_LINE].nPos += lDiff;
mpIndents[INDENT_LEFT_MARGIN].nPos += lDiff;
mpIndents[INDENT_RIGHT_MARGIN].nPos += lDiff;
- SetIndents(INDENT_COUNT, mpIndents.get() + INDENT_GAP);
+ SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP);
}
}
}
if(mpTabStopItem.get())
{
- ModifyTabs_Impl(nTabCount+TAB_GAP, mpTabs.get(), lDiff);
- SetTabs(nTabCount, mpTabs.get() + TAB_GAP);
+ ModifyTabs_Impl(nTabCount + TAB_GAP, &mpTabs[0], lDiff);
+ SetTabs(nTabCount, &mpTabs[0] + TAB_GAP);
}
}
}
@@ -1563,7 +1561,7 @@ void SvxRuler::DragMargin2()
if((!mpColumnItem.get() || IsActLastColumn()) && mpParaItem.get())
{
mpIndents[INDENT_FIRST_LINE].nPos += lDiff;
- SetIndents(INDENT_COUNT, mpIndents.get() + INDENT_GAP);
+ SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP);
}
DrawLine_Impl(lTabPos, ( TAB_FLAG && NEG_FLAG ) ? 5 : 7, bHorz);
@@ -1596,7 +1594,7 @@ void SvxRuler::DragIndents()
mpIndents[nIndex].nPos = aDragPosition;
- SetIndents(INDENT_COUNT, mpIndents.get() + INDENT_GAP);
+ SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP);
DrawLine_Impl(lTabPos, 1, bHorz);
}
@@ -1695,7 +1693,7 @@ void SvxRuler::DragTabs()
long nDelta = mpRulerImpl->nTotalDist * mpRulerImpl->pPercBuf[i];
nDelta /= 1000;
mpTabs[i].nPos = mpTabs[nIdx].nPos + nDelta;
- if(mpTabs[i].nPos+GetNullOffset() > nMaxRight)
+ if(mpTabs[i].nPos + GetNullOffset() > nMaxRight)
mpTabs[i].nStyle |= RULER_STYLE_INVISIBLE;
else
mpTabs[i].nStyle &= ~RULER_STYLE_INVISIBLE;
@@ -1710,7 +1708,7 @@ void SvxRuler::DragTabs()
mpTabs[nIdx].nStyle |= RULER_STYLE_INVISIBLE;
else
mpTabs[nIdx].nStyle &= ~RULER_STYLE_INVISIBLE;
- SetTabs(nTabCount, mpTabs.get() + TAB_GAP);
+ SetTabs(nTabCount, &mpTabs[0] + TAB_GAP);
}
void SvxRuler::SetActive(sal_Bool bOn)
@@ -1752,18 +1750,18 @@ void SvxRuler::UpdateParaContents_Impl(
{
mpIndents[INDENT_FIRST_LINE].nPos += lDifference;
mpIndents[INDENT_LEFT_MARGIN].nPos += lDifference;
- if (mpTabs.get())
+ if (!mpTabs.empty())
{
for(sal_uInt16 i = 0; i < nTabCount+TAB_GAP; ++i)
{
mpTabs[i].nPos += lDifference;
}
- SetTabs(nTabCount, mpTabs.get() + TAB_GAP);
+ SetTabs(nTabCount, &mpTabs[0] + TAB_GAP);
}
break;
}
}
- SetIndents(INDENT_COUNT, mpIndents.get() + INDENT_GAP);
+ SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP);
}
void SvxRuler::DragBorders()
@@ -1802,7 +1800,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mpRulerImpl->lLastLMargin))
if(nDragType & DRAG_OBJECT_SIZE_LINEAR)
{
long nRight = GetMargin2() - lMinFrame; // Right limiters
- for(int i = nBorderCount - 2; i >= nIndex; --i)
+ for(int i = mpBorders.size() - 2; i >= nIndex; --i)
{
long l = mpBorders[i].nPos;
mpBorders[i].nPos += lDiff;
@@ -1826,7 +1824,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mpRulerImpl->lLastLMargin))
{
int nLimit;
long lLeft;
- int nStartLimit = nBorderCount-2;
+ int nStartLimit = mpBorders.size() - 2;
switch(GetDragType())
{
default: ;//prevent warning
@@ -1865,7 +1863,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mpRulerImpl->lLastLMargin))
case RULER_TYPE_MARGIN2:
nLimit = 0;
lLeft= 0;
- nStartLimit = nBorderCount - 2;
+ nStartLimit = mpBorders.size() - 2;
mpRulerImpl->nTotalDist += lDiff;
break;
}
@@ -1941,7 +1939,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mpRulerImpl->lLastLMargin))
else
{
//otherwise the right borders are moved
- for(int i = nBorderCount-2; i >= nLimit; --i)
+ for(int i = mpBorders.size() - 2; i >= nLimit; --i)
{
mpBorders[i].nPos += lDiff;
}
@@ -1970,7 +1968,7 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mpRulerImpl->lLastLMargin))
if(!bRightIndentsCorrected &&
GetActRightColumn() == nIndex &&
nDragSize != RULER_DRAGSIZE_2 &&
- mpIndents.get() &&
+ !mpIndents.empty() &&
!mpRulerImpl->bIsTableRows)
{
UpdateParaContents_Impl(lDiff, MOVE_RIGHT);
@@ -1978,11 +1976,11 @@ ADD_DEBUG_TEXT("lLastLMargin: ", OUString::number(mpRulerImpl->lLastLMargin))
else if(!bLeftIndentsCorrected &&
GetActLeftColumn() == nIndex &&
nDragSize != RULER_DRAGSIZE_1 &&
- mpIndents.get())
+ !mpIndents.empty())
{
UpdateParaContents_Impl(lDiff, MOVE_LEFT);
}
- SetBorders(mpColumnItem->Count() - 1, mpBorders.get());
+ SetBorders(mpColumnItem->Count() - 1, &mpBorders[0]);
}
void SvxRuler::DragObjectBorder()
@@ -1994,7 +1992,7 @@ void SvxRuler::DragObjectBorder()
const sal_uInt16 nIdx = GetDragAryPos();
mpObjectBorders[GetObjectBordersOff(nIdx)].nPos = lPosition;
- SetBorders(2, mpObjectBorders.get() + GetObjectBordersOff(0));
+ SetBorders(2, &mpObjectBorders[0] + GetObjectBordersOff(0));
DrawLine_Impl(lTabPos, 7, bHorz);
}
@@ -2207,15 +2205,14 @@ void SvxRuler::ApplyTabs()
sal_uInt16 j;
for(j = 0; j < nCoreIdx; ++j)
{
- pItem->Insert((*mpTabStopItem.get())[j]);
+ pItem->Insert(mpTabStopItem->At(j));
}
for(; j < mpTabStopItem->Count(); ++j)
{
- SvxTabStop aTabStop = (*mpTabStopItem.get())[j];
+ SvxTabStop aTabStop = mpTabStopItem->At(j);
aTabStop.GetTabPos() = PixelHAdjust(
- ConvertHPosLogic(mpTabs[j + TAB_GAP].nPos -
- GetLeftIndent()) -
- lAppNullOffset,
+ ConvertHPosLogic(
+ mpTabs[j + TAB_GAP].nPos - GetLeftIndent()) - lAppNullOffset,
aTabStop.GetTabPos());
pItem->Insert(aTabStop);
}
@@ -2225,10 +2222,12 @@ void SvxRuler::ApplyTabs()
return;
else
{
- SvxTabStop aTabStop = (*mpTabStopItem.get())[nCoreIdx];
- if(mpRulerImpl->lMaxRightLogic!=-1&&
- mpTabs[nCoreIdx+TAB_GAP].nPos + Ruler::GetNullOffset() == nMaxRight)
- aTabStop.GetTabPos() = mpRulerImpl->lMaxRightLogic-lLogicNullOffset;
+ SvxTabStop aTabStop = mpTabStopItem->At(nCoreIdx);
+ if( mpRulerImpl->lMaxRightLogic != -1 &&
+ mpTabs[nCoreIdx + TAB_GAP].nPos + Ruler::GetNullOffset() == nMaxRight )
+ {
+ aTabStop.GetTabPos() = mpRulerImpl->lMaxRightLogic - lLogicNullOffset;
+ }
else
{
if(bRTL)
@@ -2238,20 +2237,17 @@ void SvxRuler::ApplyTabs()
GetLeftIndent() :
ConvertHPosPixel( GetRightFrameMargin() + lAppNullOffset );
- aTabStop.GetTabPos() = PixelHAdjust(
- ConvertHPosLogic( nTmpLeftIndent - mpTabs[nCoreIdx+TAB_GAP].nPos) - lAppNullOffset,
- aTabStop.GetTabPos());
+ long nNewPosition = ConvertHPosLogic(nTmpLeftIndent - mpTabs[nCoreIdx + TAB_GAP].nPos);
+ aTabStop.GetTabPos() = PixelHAdjust(nNewPosition - lAppNullOffset, aTabStop.GetTabPos());
}
else
{
//#i24363# tab stops relative to indent
const long nTmpLeftIndent = mpRulerImpl->bIsTabsRelativeToIndent ?
- GetLeftIndent() :
- 0;
+ GetLeftIndent() : 0;
- aTabStop.GetTabPos() = PixelHAdjust(
- ConvertHPosLogic( mpTabs[nCoreIdx+TAB_GAP].nPos - nTmpLeftIndent ) - lAppNullOffset,
- aTabStop.GetTabPos() );
+ long nNewPosition = ConvertHPosLogic(mpTabs[nCoreIdx + TAB_GAP].nPos - nTmpLeftIndent);
+ aTabStop.GetTabPos() = PixelHAdjust(nNewPosition - lAppNullOffset, aTabStop.GetTabPos());
}
}
mpTabStopItem->Remove(nCoreIdx);
@@ -2922,8 +2918,8 @@ void SvxRuler::CalcMinMax()
}
else if(DRAG_OBJECT_SIZE_LINEAR & nDragType)
{
- nMaxRight=lNullPix+GetMargin2()-GetMargin1()+
- (nBorderCount-nIdx-1)*lMinFrame;
+ nMaxRight = lNullPix + GetMargin2() - GetMargin1() +
+ (mpBorders.size() - nIdx - 1) * lMinFrame;
}
else
{
@@ -3317,13 +3313,13 @@ void SvxRuler::EndDrag()
case RULER_TYPE_INDENT: // Paragraph indents
if(lInitialDragPos != lPos)
ApplyIndents();
- SetIndents(INDENT_COUNT, mpIndents.get() + INDENT_GAP);
+ SetIndents(INDENT_COUNT, &mpIndents[0] + INDENT_GAP);
break;
case RULER_TYPE_TAB: // Tabs
{
ApplyTabs();
mpTabs[GetDragAryPos()].nStyle &= ~RULER_STYLE_INVISIBLE;
- SetTabs(nTabCount, mpTabs.get() + TAB_GAP);
+ SetTabs(nTabCount, &mpTabs[0] + TAB_GAP);
}
break;
default:
@@ -3395,8 +3391,8 @@ IMPL_LINK( SvxRuler, TabMenuSelect, Menu *, pMenu )
/* Handler of the tab menu for setting the type */
if(mpTabStopItem.get() && mpTabStopItem->Count() > mpRulerImpl->nIdx)
{
- SvxTabStop aTabStop = (*mpTabStopItem.get())[mpRulerImpl->nIdx];
- aTabStop.GetAdjustment() = ToAttrTab_Impl(pMenu->GetCurItemId()-1);
+ SvxTabStop aTabStop = mpTabStopItem->At(mpRulerImpl->nIdx);
+ aTabStop.GetAdjustment() = ToAttrTab_Impl(pMenu->GetCurItemId() - 1);
mpTabStopItem->Remove(mpRulerImpl->nIdx);
mpTabStopItem->Insert(aTabStop);
sal_uInt16 nTabStopId = bHorz ? SID_ATTR_TABSTOP : SID_ATTR_TABSTOP_VERTICAL;
@@ -3414,7 +3410,7 @@ void SvxRuler::Command( const CommandEvent& rCommandEvent )
{
CancelDrag();
sal_Bool bRTL = mpRulerImpl->pTextRTLItem && mpRulerImpl->pTextRTLItem->GetValue();
- if ( mpTabs.get() &&
+ if ( !mpTabs.empty() &&
RULER_TYPE_TAB ==
GetType( rCommandEvent.GetMousePosPixel(), &mpRulerImpl->nIdx ) &&
mpTabs[mpRulerImpl->nIdx + TAB_GAP].nStyle < RULER_TAB_DEFAULT )
@@ -3568,13 +3564,13 @@ long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const
lFences = mpBorders[nCol].nWidth;
}
- for(sal_uInt16 i = nStart; i < nBorderCount - 1; ++i)
+ for(sal_uInt16 i = nStart; i < mpBorders.size() - 1; ++i)
{
long lWidth = mpBorders[i].nPos - lOldPos;
lColumns += lWidth;
if(lWidth < lMinSpace)
lMinSpace = lWidth;
- lOldPos = mpBorders[i].nPos+mpBorders[i].nWidth;
+ lOldPos = mpBorders[i].nPos + mpBorders[i].nWidth;
lFences += mpBorders[i].nWidth;
}
long lWidth = GetMargin2() - lOldPos;
@@ -3596,7 +3592,7 @@ long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const
lColumns = GetMargin2()-lOldPos;
nActCol = nCol;
lFences = 0;
- while(nActCol < nBorderCount || nActCol == USHRT_MAX)
+ while(nActCol < mpBorders.size() || nActCol == USHRT_MAX)
{
sal_uInt16 nRight;
if(nActCol == USHRT_MAX)
@@ -3638,7 +3634,7 @@ long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const
if(mpColumnItem->IsTable())
{
sal_uInt16 nVisCols = 0;
- for(sal_uInt16 i = GetActRightColumn(sal_False, nCol); i<nBorderCount;)
+ for(sal_uInt16 i = GetActRightColumn(sal_False, nCol); i < mpBorders.size();)
{
if((*mpColumnItem.get())[i].bVisible)
nVisCols++;
@@ -3649,7 +3645,7 @@ long SvxRuler::CalcPropMaxRight(sal_uInt16 nCol) const
else
{
long lWidth = 0;
- for(sal_uInt16 i = nCol; i < nBorderCount - 1; i++)
+ for(sal_uInt16 i = nCol; i < mpBorders.size() - 1; i++)
{
lWidth += lMinFrame + mpBorders[i].nWidth;
}
commit b46079bb41591d9697339e8250d4ca7bf0930c0f
Author: Tomaž Vajngerl <quikee at gmail.com>
Date: Fri Sep 13 17:04:31 2013 +0200
Fix ruler margin dragging in vertical mode
Change-Id: I4727bbb304059859f3f5b4a96f834b41191c0bab
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 79338c3..2542ac5 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -432,12 +432,12 @@ inline long SvxRuler::ConvertSizeLogic(long nVal) const
return bHorz? ConvertHSizeLogic(nVal): ConvertVSizeLogic(nVal);
}
-long SvxRuler::PixelHAdjust(long nVal, long /*nValOld*/) const
+long SvxRuler::PixelHAdjust(long nVal, long nValOld) const
{
- //if(ConvertHSizePixel(nVal) != ConvertHSizePixel(nValOld))
+ if(ConvertHSizePixel(nVal) != ConvertHSizePixel(nValOld))
return nVal;
- //else
- // return nValOld;
+ else
+ return nValOld;
}
long SvxRuler::PixelVAdjust(long nVal, long nValOld) const
@@ -477,49 +477,59 @@ void SvxRuler::UpdateFrame()
// if no initialization by default app behavior
const long nOld = lLogicNullOffset;
lLogicNullOffset = mpColumnItem.get() ? mpColumnItem->GetLeft(): mpLRSpaceItem->GetLeft();
+
if(bAppSetNullOffset)
lAppNullOffset += lLogicNullOffset - nOld;
+
if(!bAppSetNullOffset || lAppNullOffset == LONG_MAX)
{
Ruler::SetNullOffset(ConvertHPosPixel(lLogicNullOffset));
- SetMargin1( 0, nMarginStyle );
+ SetMargin1(0, nMarginStyle);
lAppNullOffset = 0;
}
else
- SetMargin1( ConvertHPosPixel( lAppNullOffset ), nMarginStyle );
+ {
+ SetMargin1(ConvertHPosPixel(lAppNullOffset), nMarginStyle);
+ }
+
long lRight = 0;
- // evaluate the table right edge of the table
+
+ // evaluate the table right edge of the table
if(mpColumnItem.get() && mpColumnItem->IsTable())
lRight = mpColumnItem->GetRight();
else
lRight = mpLRSpaceItem->GetRight();
- sal_uIntPtr aWidth=
- ConvertHPosPixel(mpPagePosItem->GetWidth() - lRight -
- lLogicNullOffset + lAppNullOffset);
- SetMargin2( aWidth, nMarginStyle );
+ long aWidth = mpPagePosItem->GetWidth() - lRight - lLogicNullOffset + lAppNullOffset;
+ long aWidthPixel = ConvertHPosPixel(aWidth);
+
+ SetMargin2(aWidthPixel, nMarginStyle);
}
else if(mpULSpaceItem.get() && mpPagePosItem.get())
{
// relative the upper edge of the surrounding frame
const long nOld = lLogicNullOffset;
lLogicNullOffset = mpColumnItem.get() ? mpColumnItem->GetLeft() : mpULSpaceItem->GetUpper();
+
if(bAppSetNullOffset)
lAppNullOffset += lLogicNullOffset - nOld;
+
if(!bAppSetNullOffset || lAppNullOffset == LONG_MAX)
{
Ruler::SetNullOffset(ConvertVPosPixel(lLogicNullOffset));
lAppNullOffset = 0;
- SetMargin1( 0, nMarginStyle );
+ SetMargin1(0, nMarginStyle);
}
else
- SetMargin1( ConvertVPosPixel( lAppNullOffset ),nMarginStyle );
+ {
+ SetMargin1(ConvertVPosPixel(lAppNullOffset), nMarginStyle);
+ }
long lLower = mpColumnItem.get() ? mpColumnItem->GetRight() : mpULSpaceItem->GetLower();
+ long nMargin2 = mpPagePosItem->GetHeight() - lLower - lLogicNullOffset + lAppNullOffset;
+ long nMargin2Pixel = ConvertVPosPixel(nMargin2);
- SetMargin2(
- ConvertVPosPixel(mpPagePosItem->GetHeight() - lLower - lLogicNullOffset + lAppNullOffset),
- nMarginStyle);
+ SetMargin2(nMargin2Pixel, nMarginStyle);
}
else
{
@@ -754,10 +764,13 @@ void SvxRuler::UpdateColumns()
nBorderCount = mpColumnItem->Count();
mpBorders.reset(new RulerBorder[nBorderCount]);
}
+
sal_uInt16 nStyleFlags = RULER_BORDER_VARIABLE;
+
sal_Bool bProtectColumns =
- mpRulerImpl->aProtectItem.IsSizeProtected() ||
- mpRulerImpl->aProtectItem.IsPosProtected();
+ mpRulerImpl->aProtectItem.IsSizeProtected() ||
+ mpRulerImpl->aProtectItem.IsPosProtected();
+
if( !bProtectColumns )
nStyleFlags |= RULER_BORDER_MOVEABLE;
@@ -767,15 +780,18 @@ void SvxRuler::UpdateColumns()
nStyleFlags |= RULER_BORDER_SIZEABLE;
sal_uInt16 nBorders = mpColumnItem->Count();
+
if(!mpRulerImpl->bIsTableRows)
--nBorders;
+
for(sal_uInt16 i = 0; i < nBorders; ++i)
{
mpBorders[i].nStyle = nStyleFlags;
- if(!(*mpColumnItem.get())[i].bVisible)
+ if(!mpColumnItem->At(i).bVisible)
mpBorders[i].nStyle |= RULER_STYLE_INVISIBLE;
- mpBorders[i].nPos =
- ConvertPosPixel((*mpColumnItem.get())[i].nEnd + lAppNullOffset);
+
+ mpBorders[i].nPos = ConvertPosPixel(mpColumnItem->At(i).nEnd + lAppNullOffset);
+
if(mpColumnItem->Count() == i + 1)
{
//with table rows the end of the table is contained in the
@@ -784,14 +800,10 @@ void SvxRuler::UpdateColumns()
}
else
{
- mpBorders[i].nWidth =
- ConvertSizePixel((*mpColumnItem.get())[i+1].nStart -
- (*mpColumnItem.get())[i].nEnd);
+ mpBorders[i].nWidth = ConvertSizePixel(mpColumnItem->At(i + 1).nStart - mpColumnItem->At(i).nEnd);
}
- mpBorders[i].nMinPos =
- ConvertPosPixel((*mpColumnItem.get())[i].nEndMin + lAppNullOffset);
- mpBorders[i].nMaxPos =
- ConvertPosPixel((*mpColumnItem.get())[i].nEndMax + lAppNullOffset);
+ mpBorders[i].nMinPos = ConvertPosPixel(mpColumnItem->At(i).nEndMin + lAppNullOffset);
+ mpBorders[i].nMaxPos = ConvertPosPixel(mpColumnItem->At(i).nEndMax + lAppNullOffset);
}
SetBorders(mpColumnItem->Count() - 1, mpBorders.get());
}
@@ -1724,26 +1736,27 @@ void SvxRuler::SetActive(sal_Bool bOn)
}
void SvxRuler::UpdateParaContents_Impl(
- long l, // Difference
+ long lDifference,
UpdateType eType) // Art (all, left or right)
{
/* Helper function; carry Tabs and Paragraph Margins */
- switch(eType) {
- case MOVE_RIGHT:
- mpIndents[INDENT_RIGHT_MARGIN].nPos += l;
- break;
- case MOVE_ALL:
- mpIndents[INDENT_RIGHT_MARGIN].nPos += l;
- // no break
- case MOVE_LEFT:
+ switch(eType)
+ {
+ case MOVE_RIGHT:
+ mpIndents[INDENT_RIGHT_MARGIN].nPos += lDifference;
+ break;
+ case MOVE_ALL:
+ mpIndents[INDENT_RIGHT_MARGIN].nPos += lDifference;
+ // no break
+ case MOVE_LEFT:
{
- mpIndents[INDENT_FIRST_LINE].nPos += l;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list