View | Details | Raw Unified | Return to issue 93899
Collapse All | Expand All

(-)fpicker/source/aqua/SalAquaPicker.cxx (-5 / +7 lines)
Lines 48-53 Link Here
48
#include "CFStringUtilities.hxx"
48
#include "CFStringUtilities.hxx"
49
#include "NSString_OOoAdditions.hxx"
49
#include "NSString_OOoAdditions.hxx"
50
50
51
#ifndef _NSURL_OOOADDITIONS_HXX_
52
#include "NSURL_OOoAdditions.hxx"
53
#endif
54
51
#include "SalAquaFilePicker.hxx"
55
#include "SalAquaFilePicker.hxx"
52
56
53
#include <stdio.h>
57
#include <stdio.h>
Lines 188-193 Link Here
188
            break;
192
            break;
189
    }
193
    }
190
    
194
    
195
    if (retVal == NSFileHandlingPanelOKButton) {
196
        implsetDisplayDirectory([[NSURL fileURLWithPath:(NSString*)[m_pDialog directory]] OUStringForInfo:FULLPATH]);
197
    }
191
    
198
    
192
    DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
199
    DBG_PRINT_EXIT(CLASS_NAME, __func__, retVal);
193
200
Lines 217-227 Link Here
217
224
218
    if (aDirectory != m_sDisplayDirectory) {
225
    if (aDirectory != m_sDisplayDirectory) {
219
        m_sDisplayDirectory = aDirectory;
226
        m_sDisplayDirectory = aDirectory;
220
221
        if (m_pDialog != nil) {
222
            //NSLog(@"would change now to:%@", [NSString stringWithOUString:aDirectory]);
223
            // [m_pDialog setDirectory:[NSString stringWithOUString:aDirectory]];
224
        }
225
    }
227
    }
226
228
227
    DBG_PRINT_EXIT(CLASS_NAME, __func__);
229
    DBG_PRINT_EXIT(CLASS_NAME, __func__);
(-)fpicker/source/aqua/SalAquaFilePicker.cxx (-4 lines)
Lines 357-366 Link Here
357
            if (nFiles > 1) {
357
            if (nFiles > 1) {
358
                aSelectedFiles[0] = OUString(sDirectoryURL);
358
                aSelectedFiles[0] = OUString(sDirectoryURL);
359
            }
359
            }
360
361
            implsetDisplayDirectory(sDirectoryURL);
362
363
            OSL_TRACE("dir url: %s", OUStringToOString(sDirectoryURL, RTL_TEXTENCODING_UTF8).getStr());
364
        }
360
        }
365
    
361
    
366
        short nSequenceIndex = nFiles > 1 ? nIndex + 1 : nIndex;
362
        short nSequenceIndex = nFiles > 1 ? nIndex + 1 : nIndex;
(-)fpicker/source/aqua/SalAquaFilePicker.cxx (-4 lines)
Lines 357-366 Link Here
357
            if (nFiles > 1) {
357
            if (nFiles > 1) {
358
                aSelectedFiles[0] = OUString(sDirectoryURL);
358
                aSelectedFiles[0] = OUString(sDirectoryURL);
359
            }
359
            }
360
361
            implsetDisplayDirectory(sDirectoryURL);
362
363
            OSL_TRACE("dir url: %s", OUStringToOString(sDirectoryURL, RTL_TEXTENCODING_UTF8).getStr());
364
        }
360
        }
365
    
361
    
366
        short nSequenceIndex = nFiles > 1 ? nIndex + 1 : nIndex;
362
        short nSequenceIndex = nFiles > 1 ? nIndex + 1 : nIndex;

Return to issue 93899