diff options
| author | Andras Timar <atimar@suse.com> | 2012-10-13 17:41:05 +0200 |
|---|---|---|
| committer | Andras Timar <atimar@suse.com> | 2012-10-13 17:41:05 +0200 |
| commit | e5ce011c3f32f53ef073aec5485450b2588b656a (patch) | |
| tree | 8a838a53bcdd70cc3d4cdbca0ebe07504790952e /fpicker/source/generic/fpicker.component | |
| parent | c6b26144c93aa5222e4260c5b0ef45ce5bdc18d2 (diff) | |
| parent | e74fc93e4aba7887e6a278cc44c4bc0962471065 (diff) | |
Merge branch 'master' into feature/killsdf
Conflicts:
Makefile.top
Module_tail_build.mk
RepositoryExternal.mk
RepositoryFixes.mk
accessibility/source/standard/vclxaccessibletoolbox.cxx
basic/source/uno/dlgcont.cxx
connectivity/Library_ado.mk
cross_tail_build/prj/build.lst
desktop/source/offacc/acceptor.cxx
filter/Library_PptImporter.mk
filter/source/t602/filterenv.cxx
i18npool/Library_textconv_dict.mk
ooo.lst.in
saxon/ExternalProject_saxon.mk
saxon/build.xml
sc/sdi/scalc.sdi
sc/source/filter/xml/xmlstyli.cxx
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatmgr.cxx
sc/source/ui/view/cellsh1.cxx
sdext/source/pdfimport/misc/pwdinteract.cxx
shell/qa/zip/makefile.mk
shell/qa/zip/testimpl/makefile.mk
solenv/gbuild/CppunitTest.mk
solenv/gbuild/gbuild.mk
solenv/gbuild/platform/android.mk
solenv/gbuild/platform/com_GCC_defs.mk
solenv/gbuild/platform/macosx.mk
soltools/Executable_adjustvisibility.mk
soltools/Executable_checkdll.mk
soltools/Executable_cpp.mk
soltools/Executable_javadep.mk
soltools/Executable_makedepend.mk
sw/qa/extras/rtfimport/rtfimport.cxx
tail_build/prj/build.lst
tomcat/ExternalProject_tomcat.mk
ucb/source/ucp/webdav/webdavcontent.cxx
xml2cmp/Executable_xml2cmp.mk
Diffstat (limited to 'fpicker/source/generic/fpicker.component')
| -rw-r--r-- | fpicker/source/generic/fpicker.component | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fpicker/source/generic/fpicker.component b/fpicker/source/generic/fpicker.component index b87a2c8be085..7aee017dc99a 100644 --- a/fpicker/source/generic/fpicker.component +++ b/fpicker/source/generic/fpicker.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="fpicker" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.fpicker.FilePicker"> <service name="com.sun.star.ui.dialogs.FilePicker"/> |