diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-09-28 17:17:07 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-09-28 17:17:07 +0200 |
| commit | 243aa82066d78f18ddcc7fbbc1ddcb03d7a0ecde (patch) | |
| tree | 497fa9e1580d9eef1104858068e7099e34980512 /sfx2/sdi | |
| parent | 0a266bd33b8786869cdeab8325f8f1b1900533ad (diff) | |
merge problems
Diffstat (limited to 'sfx2/sdi')
| -rw-r--r-- | sfx2/sdi/sfxitems.sdi | 1 | ||||
| -rw-r--r-- | sfx2/sdi/sfxslots.sdi | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/sfx2/sdi/sfxitems.sdi b/sfx2/sdi/sfxitems.sdi index c3c5bf6f4212..30fe37ffa5f0 100644 --- a/sfx2/sdi/sfxitems.sdi +++ b/sfx2/sdi/sfxitems.sdi @@ -85,4 +85,5 @@ String Language MID_SCRIPT_ORGANIZER_LANGUAGE;
};
item SfxScriptOrganizer SfxScriptOrganizerItem;
+ item String SvxClipboardFmtItem; //! Dummy
diff --git a/sfx2/sdi/sfxslots.sdi b/sfx2/sdi/sfxslots.sdi index 6a8505e9aaa2..44cd45d00868 100644 --- a/sfx2/sdi/sfxslots.sdi +++ b/sfx2/sdi/sfxslots.sdi @@ -39,7 +39,6 @@ SlotIdFile( "sfx2/sfx.hrc" ) ] { include "sfxitems.sdi" - item String SvxClipboardFmtItem; //! Dummy include "sfx.sdi" include "docslots.sdi" include "viwslots.sdi" |