diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-12-07 17:43:56 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-12-07 17:43:56 +0100 |
| commit | cee9bce554887502b98ae64fc38592069d651b8e (patch) | |
| tree | 1f69d79319a1512079d99605906acbbff7d3a69b | |
| parent | 342e37f151084dfb8f840c0cfaa4674dcf880267 (diff) | |
some fixes after resync
| -rw-r--r-- | svtools/source/uno/makefile.mk | 2 | ||||
| -rw-r--r-- | vcl/inc/vcl/svdata.hxx | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/svtools/source/uno/makefile.mk b/svtools/source/uno/makefile.mk index 7b992637e152..82e509f1ce08 100644 --- a/svtools/source/uno/makefile.mk +++ b/svtools/source/uno/makefile.mk @@ -58,7 +58,7 @@ SLOFILES= \ $(SLO)$/unocontroltablemodel.obj \ $(SLO)$/unoevent.obj \ $(SLO)$/unoiface.obj \ - $(SLO)$/unoimap.obj \ + $(SLO)$/unoimap.obj \ $(SLO)$/svtxgridcontrol.obj # --- Targets ------------------------------------------------------ diff --git a/vcl/inc/vcl/svdata.hxx b/vcl/inc/vcl/svdata.hxx index d912c172baa5..17ad1aa28c1a 100644 --- a/vcl/inc/vcl/svdata.hxx +++ b/vcl/inc/vcl/svdata.hxx @@ -138,6 +138,7 @@ struct ImplSVAppData ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxMSF; String* mpMSFTempFileName; + AllSettings* mpSettings; // Application settings LocaleConfigurationListener* mpCfgListener; VclEventListeners* mpEventListeners; // listeners for vcl events (eg, extended toolkit) VclEventListeners* mpKeyListeners; // listeners for key events only (eg, extended toolkit) |